Merge branch 'bug-1293' into release
authorBenny Baumann <BenBE@geshi.org>
Thu, 28 Aug 2014 07:22:31 +0000 (09:22 +0200)
committerBenny Baumann <BenBE@geshi.org>
Thu, 28 Aug 2014 07:22:31 +0000 (09:22 +0200)

Trivial merge