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)

Trivial merge