Merge branch 'bug-1159' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 21 Apr 2013 21:16:56 +0000 (23:16 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 21 Apr 2013 21:16:56 +0000 (23:16 +0200)

Trivial merge