Merge branch 'bug-1255' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 9 Mar 2014 19:38:16 +0000 (20:38 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 9 Mar 2014 19:38:16 +0000 (20:38 +0100)

Trivial merge