Merge branch 'bug-1357' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 13 Jan 2015 22:04:03 +0000 (23:04 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 13 Jan 2015 22:04:03 +0000 (23:04 +0100)
commit748d87b9e8d45cfba944fd6ba5f4a0f6a98967f0
tree515f5656095451f2a077784d76d2e68d5e105a64
parented1d1b8880770a613a011668e93664dcd18c3dc7
parent0ee9c78f30399241b18f7fa3db52ffa91e7a7c2b
Merge branch 'bug-1357' into testserver-stable