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

Trivial merge