Merge branch 'release' into bug-1024
authorMichael Tänzer <neo@nhng.de>
Wed, 28 Mar 2012 21:35:54 +0000 (23:35 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 28 Mar 2012 21:35:54 +0000 (23:35 +0200)
commit02d307527b6797e8dd6f6117b8ff24707d007137
tree8235c0241681f92203cdc51f8b310a7a9f2e6912
parentd4bd109238aec503ad1d8abc1cd12ad8a12bba46
parentb9d60cb4824796dc85d60e672d076ae25e534682
Merge branch 'release' into bug-1024

Conflicts:
includes/lib/account.php

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