Merge branch 'bug-1412' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Feb 2016 21:02:59 +0000 (22:02 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Feb 2016 21:02:59 +0000 (22:02 +0100)
commit32f3dd9a6919468d3730b643b076a136149202bb
tree1dfcc137495137452cde9b10a15343091751bcad
parentf84d7c2ca78529eedcb93bb55638514205747198
parent1a39b4e976c6aa9882ca00b0a12b5c35469933fe
Merge branch 'bug-1412' into testserver-stable
includes/account.php
includes/general.php