Merge branch 'bug-807' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 13 Jun 2014 07:20:43 +0000 (09:20 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 13 Jun 2014 07:20:43 +0000 (09:20 +0200)

Trivial merge