From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Mon, 14 Dec 2015 07:31:47 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~16^2~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6da36c8c15bbf6a6906c44cc5b3a029e3abc153c;p=clitk.git

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

6da36c8c15bbf6a6906c44cc5b3a029e3abc153c