Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Fri, 18 Oct 2013 13:33:54 +0000 (15:33 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Fri, 18 Oct 2013 13:33:54 +0000 (15:33 +0200)
commit72852b54cb016a05a0ffc5cf6978db9b673ddb40
treeffd27376f3d579047156e9a78c2f2886b752194f
parent79fed64e9227b5c1814df23829901d32c1811ae1
parent3a637dd3b2f2fd2698b98aaf3e1ac899614fb01e
Merge branch 'maint'