Merge branch 'bug-1339' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:36:13 +0000 (19:36 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:36:13 +0000 (19:36 +0100)

Trivial merge