Merge branch 'bug-1049' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 21 Apr 2015 19:41:00 +0000 (21:41 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 21 Apr 2015 19:41:00 +0000 (21:41 +0200)
commit18ba0be6dd5da48f4bb602b22cf9605977393018
treea451ca33175369761856cfc53fdf1591f0df4592
parente72534dab5241f43369e92d01d0ab4b0bd8ea4e1
parent3c3384a56a8db9303a8a331ad318e8fc41c0ca2b
Merge branch 'bug-1049' into bug-1042