Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Thu, 27 Dec 2012 10:20:13 +0000 (27 11:20 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Thu, 27 Dec 2012 10:20:13 +0000 (27 11:20 +0100)

Trivial merge