Merge branch 'bug-918' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:36:31 +0000 (22:36 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:36:31 +0000 (22:36 +0200)

Trivial merge