From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Tue, 6 Jan 2015 14:11:34 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~95^2~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8272e1ef65c98178771f62768ced173d09e40e33;p=clitk.git

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

8272e1ef65c98178771f62768ced173d09e40e33