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