Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Sun, 28 Apr 2013 07:56:35 +0000 (28 09:56 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Sun, 28 Apr 2013 07:56:35 +0000 (28 09:56 +0200)

Trivial merge