Merge branch 'maint'
commita184f87704746ba1b358358fb4fa2564280eb4eb
authorSven Verdoolaege <skimo@kotnet.org>
Wed, 5 Aug 2015 13:34:09 +0000 (5 15:34 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Wed, 5 Aug 2015 13:34:09 +0000 (5 15:34 +0200)
tree9786a6e78430f023c9818ccbd19e9de49770e4c8
parent42567286c91b96c154ac37891ff7ef404c7159f8
parentfe865996e41126ebb25b78e4335e0114282003e7
Merge branch 'maint'