Merge remote-tracking branch 'origin/bug-1137' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:03:11 +0000 (01:03 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:03:11 +0000 (01:03 +0100)
commitbc5cb72198019f4b27aa8e11b250c65cc8ca5717
tree2970ddbd2bfcb5caf8224377ea203f1ccaf7ff1d
parent41e6ea88f5a2a6ac374f26f2239f87e1d7164255
parent1cbbc32a0b73db83460cf947228bb12ef339ac5a
Merge remote-tracking branch 'origin/bug-1137' into release
includes/notary.inc.php
pages/wot/6.php