Merge branch 'bug-1390'
authorBenny Baumann <BenBE@geshi.org>
Tue, 28 Jul 2015 20:37:53 +0000 (22:37 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 28 Jul 2015 20:37:53 +0000 (22:37 +0200)
commit5a7e58532094a15203a35765f56ebd002a62a005
tree6b20250ed840ec25c1dfe327821bc004feec3f55
parente3611f709b9ab00a206120afbb421b5f3051be63
parentc28a5e261f2ab696b1e3959ddfa3b44a79ff8a19
Merge branch 'bug-1390'