Merge branch 'bug-1182' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:32:00 +0000 (22:32 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:32:00 +0000 (22:32 +0200)

Trivial merge