Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 20:45:18 +0000 (21:45 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 20:45:18 +0000 (21:45 +0100)
commit8b0230a357ffdd904457b408aa1f4621b4b5a9e7
treed97d9061abbf0fa2ff0cb80f05cb7c72dba2335e
parent2283bc4fff6e0d3c66b0636c3150de7bae360cb6
parent41ace6dc77532a5d982af220e14a29714e0ab34b
Merge branch 'bug-1354' into testserver-stable