Merge branch 'release' into bug-1138
authorMichael Tänzer <neo@nhng.de>
Tue, 4 Feb 2014 22:29:23 +0000 (23:29 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 4 Feb 2014 22:29:23 +0000 (23:29 +0100)
commit2636d78df8972e2fae91c0785c0a87262adc62bb
treee863556b9a1d85db8fa6c921eda10ea456f611e3
parent73fc407c07205e87d537338101ba133393aa80e2
parentd810496e718e2545565e7b05687b763bdc628b92
Merge branch 'release' into bug-1138

Conflicts:
includes/account.php
includes/notary.inc.php

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