Merge branch 'bug-1048' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 21 Apr 2015 19:40:48 +0000 (21:40 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 21 Apr 2015 19:40:48 +0000 (21:40 +0200)
commite72534dab5241f43369e92d01d0ab4b0bd8ea4e1
treeb58ab7077a8d7f3c20d62fb0168922d7bc2415ed
parent6ab83352e58471f9a99c7b0026f2315757eeaea0
parentbab1c3c5fc605ce9d1f4191bbf2ac1f2b2ec2c08
Merge branch 'bug-1048' into bug-1042