Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Tue, 14 Feb 2012 23:22:47 +0000 (00:22 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Tue, 14 Feb 2012 23:22:47 +0000 (00:22 +0100)
commit8f52ea51fa97d17c112722a67109410eef78bd93
tree5bdb4817a2a6866100e8e744d6427e7da9e31781
parentf8b81b5a5364bd6d6da004d92dac40b650e365f1
parentc51e471c3a0e6fa8d0ebd2c901a925edeb78ff02
Merge branch 'maint'