Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Sun, 28 Apr 2013 07:56:35 +0000 (09:56 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Sun, 28 Apr 2013 07:56:35 +0000 (09:56 +0200)
commit0e1beed0cd7ffd213187079a299f75e5ae0dc72d
tree73ad682ddb793be575c0dc2e3b79371548495a54
parente9a49bbd8cc3880e41d5856a575b03d755cb7aec
parent5e5bf20dd20abdbb96d6897f780fd72e4737bd59
Merge branch 'maint'