Merge branch 'maint'
commite559c7147a1cb2deb98bf11b742cd13c45e9027d
authorSven Verdoolaege <skimo@kotnet.org>
Mon, 30 Jan 2012 14:28:04 +0000 (30 15:28 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Mon, 30 Jan 2012 14:28:04 +0000 (30 15:28 +0100)
treea5221b0bfd992c3f467442e89e88cad78a495969
parentc7dc96220f337df2adad12f078e24160a4ca85f7
parent1b2fdb66ffd371c89f3ebeb0d06a3eef97a967ce
Merge branch 'maint'