Merge branch 'asquelt-safechars'
authormh <mh@immerda.ch>
Fri, 27 Jun 2014 16:46:49 +0000 (18:46 +0200)
committermh <mh@immerda.ch>
Fri, 27 Jun 2014 16:46:49 +0000 (18:46 +0200)

Trivial merge