Merge branch 'bug-1050' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:10 +0000 (22:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:10 +0000 (22:50 +0200)

Trivial merge