From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Tue, 7 Jun 2016 09:20:33 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~16^2~3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f396442c6161cc824a1794863c0d98322ed1d9b5;p=clitk.git

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

f396442c6161cc824a1794863c0d98322ed1d9b5