From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Thu, 6 Jun 2013 16:12:08 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~218
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=226d4c1d1400f7b5f95e6ec9766ed148e1683ecf;p=clitk.git

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

226d4c1d1400f7b5f95e6ec9766ed148e1683ecf