Merge branch 'bug-1043' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Sun, 19 Apr 2015 10:23:23 +0000 (12:23 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 19 Apr 2015 10:23:23 +0000 (12:23 +0200)

Trivial merge