Merge branch 'bug-1316' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 28 Oct 2014 20:44:05 +0000 (21:44 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 28 Oct 2014 20:44:05 +0000 (21:44 +0100)
1  2 
includes/notary.inc.php
pages/account/43.php

Simple merge
Simple merge