Merge branch 'bug-1266' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:07:55 +0000 (23:07 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:07:55 +0000 (23:07 +0200)

Trivial merge