From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Tue, 8 Jul 2014 14:35:35 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~114
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cca0bd0f7fa28f196192c835dc60a6eff7541973;p=clitk.git

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

cca0bd0f7fa28f196192c835dc60a6eff7541973