Merge branch 'bug-1172' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 21:50:49 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 21:50:49 +0000 (23:50 +0200)

Trivial merge