Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Fri, 18 Oct 2013 13:33:54 +0000 (18 15:33 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Fri, 18 Oct 2013 13:33:54 +0000 (18 15:33 +0200)

Trivial merge