Merge branch 'bug-932'
authorBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:52:44 +0000 (22:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:52:44 +0000 (22:52 +0200)

Trivial merge