Merge branch 'bug-999' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 19:57:21 +0000 (21:57 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 19:57:21 +0000 (21:57 +0200)
1  2 
includes/notary.inc.php
pages/account/43.php

Simple merge
Simple merge