Merge branch 'bug-893' into bug-1136
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:39:06 +0000 (23:39 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:39:06 +0000 (23:39 +0200)
commit3cbac6cc51939d04ee6adadcaf07d5b27947d5dc
tree305c316f3d8b24b7e2d6deb2ce31a81c8246611e
parent23ee6915a319bf79b92c494ced798a8c67817ad3
parent56e830101351d98510a01a664a34951b2fef9af8
Merge branch 'bug-893' into bug-1136
includes/notary.inc.php
pages/account/43.php