Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Thu, 1 May 2014 11:06:36 +0000 (1 13:06 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Thu, 1 May 2014 11:06:36 +0000 (1 13:06 +0200)

Trivial merge