Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Mon, 16 Jul 2012 11:09:19 +0000 (13:09 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Mon, 16 Jul 2012 11:09:46 +0000 (13:09 +0200)
commitd4c0289b68acd7ea74abbb7a28a7460e8ac8d8c2
tree75234af2121a833a19bbe3418a2e1e27137ab284
parentdbbe5de13c10b552560f0fffbb54856358b5a759
parent27c053bd4f3f78871dce000f8d96a7cd9796b03d
Merge branch 'maint'

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