Merge branch 'bug-1394' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:28:04 +0000 (19:28 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:28:04 +0000 (19:28 +0200)
commit008a344ffb238e916db4556a4e9cadf689ab38fd
tree68cb2e70ae8a04dfbf46fda0d5f1ba4406d7c274
parent3d8eec2fc1060e2307d8cd127e7f1ae331fc9c44
parent9085fb415d2252657d6d3151ee00b1d96fde8abb
Merge branch 'bug-1394' into testserver-stable
includes/account.php