Merge branch 'release' into bug-440
authorMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 02:18:30 +0000 (03:18 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 02:18:30 +0000 (03:18 +0100)
commit6238e3b56e965aeb8eaa3345af330e96714f3989
tree1bfbcd4dce8e2aa36b1207193a284ca7bfdcae7f
parent654e5db51486c4da9941ba2c3b02b037c1918533
parent234b43aca01ba78b9aff492591f84187ca12a664
Merge branch 'release' into bug-440

Conflicts:
includes/account.php

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