From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 31 Aug 2012 13:08:04 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~281^2~17
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dd6976090ab45c4ac8e483355851e4d35c828259;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

dd6976090ab45c4ac8e483355851e4d35c828259