Merge branch 'bug-782' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:23:54 +0000 (21:23 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:23:54 +0000 (21:23 +0200)

Trivial merge