Merge branch 'bug-28' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:21:16 +0000 (15:21 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:21:16 +0000 (15:21 +0100)
commit1cc5257aba1e6ae883caf464eaadf25783d2279d
treec9274d32c2cdee6af9b7fafab759c3862f3f693f
parent0bae20ba9f726c964eaee62a3b41c2da65bb8f0b
parent0950de5691c8f3e6b3115413e54d4932a2c923c7
Merge branch 'bug-28' into release

Conflicts:
includes/account.php
scripts/cron/warning.php
www/disputes.php
www/wot.php
includes/account.php
includes/lib/l10n.php
scripts/cron/warning.php
www/disputes.php
www/wot.php