Merge branch 'bug-1131' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 21:02:17 +0000 (22:02 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 21:02:17 +0000 (22:02 +0100)

Trivial merge