Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 20:08:37 +0000 (21:08 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 20:08:37 +0000 (21:08 +0100)
commit6133fe2452bf0c514521b55e31a2c9ad11c9b41b
tree7c9b90a8f3c14e6afd77a86be78c81f8c3e0d646
parentee87b9734f5925dff68780c8e8ae65cfb79d57f8
parent0988a0c268653910f78a50e16d34edf14a89dc13
Merge branch 'bug-1131' into testserver-stable