Merge branch 'bug-1048' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 21 Apr 2015 19:40:48 +0000 (21:40 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 21 Apr 2015 19:40:48 +0000 (21:40 +0200)

Trivial merge