Merge branch 'bug-1003' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 21 Oct 2013 21:29:23 +0000 (23:29 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 21 Oct 2013 21:29:23 +0000 (23:29 +0200)

Trivial merge