Merge branch 'bug-1281' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:25:29 +0000 (20:25 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:25:29 +0000 (20:25 +0200)

Trivial merge