Merge branch 'bug-1345' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 16:43:10 +0000 (17:43 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 16:43:10 +0000 (17:43 +0100)

Trivial merge