Merge branch 'bug-1102' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 21:48:47 +0000 (23:48 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 21:48:47 +0000 (23:48 +0200)

Trivial merge