Merge branch 'bug-929' into release
authorBenny Baumann <BenBE@geshi.org>
Sat, 7 Jun 2014 08:07:53 +0000 (10:07 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 7 Jun 2014 08:07:53 +0000 (10:07 +0200)

Trivial merge