Merge branch 'bug-1050' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 13:09:08 +0000 (15:09 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 13:09:08 +0000 (15:09 +0200)
commit98d88dac5ecf429411385dce42af6c78382ec5bf
tree9eae7c192b35007adc633f07f457fec749ad0cf9
parent18ba0be6dd5da48f4bb602b22cf9605977393018
parent5a2807d31137d71120c20e1b90f32b189502e7b8
Merge branch 'bug-1050' into bug-1042