Merge branch 'bug-1190' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 15 Jul 2013 21:19:11 +0000 (23:19 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 15 Jul 2013 21:19:11 +0000 (23:19 +0200)

Trivial merge