Merge branch 'release' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 12:56:01 +0000 (13:56 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 12:56:01 +0000 (13:56 +0100)
commitdd9d8f84843eef8c5e5d744c91116a0d532f655a
treed0639cbe8e220e36ca6325b20463e280f37a54a2
parentf535d495a1d1cf230770abaca301375ac7f46e49
parent1cc5257aba1e6ae883caf464eaadf25783d2279d
Merge branch 'release' into testserver-stable

Conflicts:
includes/account.php
scripts/cron/warning.php
www/disputes.php
www/index.php
www/disputes.php
www/index.php