Merge branch 'bug-1226' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:26:08 +0000 (20:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:26:08 +0000 (20:26 +0200)
commitfa3a17789986431c15dac26c43a8100ee7e8d0d4
treef20066d630377f403fe4fccb36934e30dc65a450
parent197205a43d5fbdfb9371c65881a6a6d5b965900a
parent92e73d70093e44747edfbb7c731445dd74bc864a
Merge branch 'bug-1226' into release
includes/notary.inc.php
www/wot.php