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

Trivial merge