Merge branch 'bug-893' into bug-1136
authorBenny Baumann <BenBE@geshi.org>
Mon, 22 Jul 2013 05:22:37 +0000 (07:22 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 22 Jul 2013 05:22:37 +0000 (07:22 +0200)
commit23ee6915a319bf79b92c494ced798a8c67817ad3
tree840c4623882af549d6543307731e50d031dbf2a1
parent2e6489775c62b7a0ef4e4bcbb0effc6c12c305a3
parent32bec6416a6f6e40b912a707830b6c7385a9a056
Merge branch 'bug-893' into bug-1136

Conflicts:
includes/temp_functions.php
pages/account/43.php
includes/account.php
includes/notary.inc.php
pages/account/43.php