Merge branch 'bug-1052' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 17:51:20 +0000 (19:51 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 17:51:20 +0000 (19:51 +0200)

Trivial merge