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

Trivial merge