Merge branch 'bug-1046' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:06:33 +0000 (20:06 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:06:33 +0000 (20:06 +0200)

Trivial merge