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

Trivial merge