Merge branch 'bug-1199' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:34:53 +0000 (22:34 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:34:53 +0000 (22:34 +0200)

Trivial merge