Merge branch 'bug-1052' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 18:42:46 +0000 (20:42 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 18:42:46 +0000 (20:42 +0200)

Trivial merge