Merge branch 'bug-1059' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:26:58 +0000 (00:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:26:58 +0000 (00:26 +0200)

Trivial merge