Merge branch 'bug-1094' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 18:00:20 +0000 (20:00 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 18:00:20 +0000 (20:00 +0200)

Trivial merge