Merge branch 'bug-1316' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:21 +0000 (22:01 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:21 +0000 (22:01 +0200)
commit7b6df2c0a416e5cd5d622ae387fd51ef35ae1cc9
tree489fa0b6f9674b4ce3afd37eff35f88e5bf75564
parentf2ae0815c65d2c99fba4a3e20d4765343f9050f3
parentd2cd5782146fa5a7324d9f4c2f197d153810167c
Merge branch 'bug-1316' into bug-1042