Merge branch 'bug-932'
authorBenny Baumann <BenBE@geshi.org>
Tue, 8 Sep 2015 18:37:53 +0000 (20:37 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 8 Sep 2015 18:37:53 +0000 (20:37 +0200)

Trivial merge