Merge branch 'bug-1221' into bug-1138
authorMichael Tänzer <neo@nhng.de>
Tue, 29 Apr 2014 14:13:59 +0000 (16:13 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 29 Apr 2014 14:13:59 +0000 (16:13 +0200)
commitbb11f3a0645a6b96767c9c318fa239a12c3351e5
tree2dba41fa37855e6f1165c89d91c04c1bc18d6f3d
parent4f555bd41ae6340c21f199512090e1e47d08fa3a
parent1a119ab85f3bd5b352223ceef6ba8f29151130b2
Merge branch 'bug-1221' into bug-1138

Conflicts:
includes/account.php
includes/general.php
includes/loggedin.php
includes/notary.inc.php
pages/account/43.php
pages/account/55.php
pages/wot/10.php
www/index.php
www/wot.php

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