Merge branch 'bug-1282' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 21:54:19 +0000 (22:54 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 21:54:19 +0000 (22:54 +0100)

Trivial merge