From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Thu, 18 Jul 2013 08:52:25 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~169
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3f3fe9260222ca3ec2a9a22b9f81009506792e38;p=clitk.git

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

3f3fe9260222ca3ec2a9a22b9f81009506792e38