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)
1  2 
includes/notary.inc.php
pages/account/43.php

Simple merge
Simple merge