Merge branch 'bug-411' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 23 Oct 2013 17:48:36 +0000 (19:48 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 23 Oct 2013 17:48:36 +0000 (19:48 +0200)

Trivial merge