Merge branch 'bug-1304' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 20:26:23 +0000 (22:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 20:26:23 +0000 (22:26 +0200)

Trivial merge