Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Tue, 3 Jan 2012 10:43:51 +0000 (11:43 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Tue, 3 Jan 2012 10:43:51 +0000 (11:43 +0100)
commita9b4dfb0d63084448fe6997f2a2a342109b64dee
tree27363bb0f8b0d8c0582bc6fc397f1e974b5c03c1
parent302ec18201b75c787f4923be0e37676be0af7ccb
parent0a7e21ad10402affbe01d65efb0575ad29b39c3c
Merge branch 'maint'