Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Tue, 4 Aug 2015 20:08:09 +0000 (22:08 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 4 Aug 2015 20:08:09 +0000 (22:08 +0200)
commit97cfec770519e6f1d18b1d1696abcdcb81c3c86c
tree7786408081d21b961adc141f2f7a016ae1c8103e
parent39b237c1d4e035e6df6a7588261b6460eaf757ed
parente33a8de01c1548d155bf08d362de241906ef16c3
Merge branch 'bug-1391'