Merge branch 'release' into bug-1221
authorMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 15:34:32 +0000 (16:34 +0100)
committerMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 15:34:32 +0000 (16:34 +0100)
1  2 
CommModule/client.pl
includes/account.php
includes/notary.inc.php
www/wot.php

Simple merge
Simple merge
Simple merge
diff --cc www/wot.php
Simple merge