Merge branch 'averni-master'
authormh <mh@immerda.ch>
Fri, 13 Jun 2014 09:23:47 +0000 (11:23 +0200)
committermh <mh@immerda.ch>
Fri, 13 Jun 2014 09:23:47 +0000 (11:23 +0200)

Trivial merge