Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:05:37 +0000 (08:05 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:05:37 +0000 (08:05 +0200)
commit733814fd08a122cf076887602894bf80175f5687
treec9e136fb57795a1b25fba3284cb504c38dc4f257
parentdae1d5c7f82c985715e7e6aee9e6355efe560247
parent3c8663a208346f502173a4b123d98120869b0765
Merge branch 'bug-1391'