Merge branch 'bug-1050' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:28 +0000 (22:01 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:28 +0000 (22:01 +0200)
commit077e11d3463696add95127dcfd518e95d19187b4
tree489fa0b6f9674b4ce3afd37eff35f88e5bf75564
parent7b6df2c0a416e5cd5d622ae387fd51ef35ae1cc9
parentbf55612a197070a13d24823686bd6f2ea5f8211b
Merge branch 'bug-1050' into bug-1042