Merge branch 'maint'
commitb522fa3e230ed4049a2f88b54288f71f6256ca5e
authorSven Verdoolaege <skimo@kotnet.org>
Fri, 27 Jul 2012 16:21:24 +0000 (27 18:21 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Fri, 27 Jul 2012 16:21:28 +0000 (27 18:21 +0200)
tree821408119ec40b2c8d42c0de35fcc6667f79848a
parentd4c0289b68acd7ea74abbb7a28a7460e8ac8d8c2
parent4f18f8b56696653a541674f3c704ceb103b47d00
Merge branch 'maint'

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>