Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 20:01:16 +0000 (22:01 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 20:01:16 +0000 (22:01 +0200)
Conflicts:
includes/account.php

Signed-off-by: Michael Tänzer <neo@nhng.de>

Trivial merge