Merge branch 'release' into bug-1221
authorMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 21:28:30 +0000 (22:28 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 21:28:30 +0000 (22:28 +0100)
commitee50e854893eb006cc716ed5c6a3d595283f990d
tree5944a743a6dcb40a3e5c58093e002d46b13fe164
parent323e617e2ca22b3ca985844d81f088f52d9824e6
parentedfa0f26687ca34b391c96ba94228e6642cbbc2e
Merge branch 'release' into bug-1221

Conflicts:
www/stats.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
includes/account.php
scripts/cron/refresh_stats.php
www/stats.php