Merge branch 'bug-372' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 17:54:51 +0000 (19:54 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 17:54:51 +0000 (19:54 +0200)

Trivial merge