Merge branch 'bug-1190' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 9 Sep 2013 19:02:59 +0000 (21:02 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 9 Sep 2013 19:02:59 +0000 (21:02 +0200)

Trivial merge