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)
commit87abed1d66eec48de70f9b41dad4c7523d9fb128
treeefc45bfea0c0199652c28375322d3bc84a46f825
parentd2ad5c5c27f4daeabd3f53268cdeab2b706e6e97
parent4f3527d8a117f401395e3fc1ae383c12d0381dd0
Merge branch 'bug-999' into release
includes/notary.inc.php
pages/account/43.php