Merge branch 'bug-1061' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:52:48 +0000 (00:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:52:48 +0000 (00:52 +0200)
commitc2f2aedfdd889e9eb8bedeb60df5a5e8cad361a6
treeef9ca6473803d5efe33144a9046bcf8f8376ea6e
parente6c30671e0e2515e627372ad96021f2973faa41d
parentc455e886de73ee737ae62d173cdf5f98a27b5004
Merge branch 'bug-1061' into bug-1042