Merge branch 'bug-1316' into bug-1050 bug-1050
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:07 +0000 (22:01 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:07 +0000 (22:01 +0200)
commitbf55612a197070a13d24823686bd6f2ea5f8211b
tree1bb614d5fb3d5a04a0b7090de9d86bed592aaf1d
parent3abe7dcec217fd183e042e66e4356738af019e41
parentd2cd5782146fa5a7324d9f4c2f197d153810167c
Merge branch 'bug-1316' into bug-1050