Merge branch 'bug-1316' into bug-1050
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:21:04 +0000 (23:21 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:21:04 +0000 (23:21 +0200)

Trivial merge