Merge branch 'bug-1060' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:52:25 +0000 (00:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:52:25 +0000 (00:52 +0200)
commite6c30671e0e2515e627372ad96021f2973faa41d
treeb5dc64533e9c996acdfc30111049679bfd34c4df
parentf0cdbfab3852d7bad78df54d4c474ca2f6b0f736
parent8e447dced0b5906a132d74870539fc639d3cc202
Merge branch 'bug-1060' into bug-1042