Merge branch 'bug-1129' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:13:53 +0000 (01:13 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:13:53 +0000 (01:13 +0100)
commite2ad7792c3dd5c6b74a41f83882dd975306c8b37
tree3c9a69f7d501251a205437bf40f2edd52c519316
parent748d87b9e8d45cfba944fd6ba5f4a0f6a98967f0
parent4274f646ae105b9f5df0176fc8a59c1751cc54e3
Merge branch 'bug-1129' into testserver-stable

Conflicts:
pages/account/13.php
pages/account/43.php