From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Mon, 5 May 2014 06:22:22 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~16^2~10^2~9
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f6381b1392a2b4e14510a5a646386d76a2823f76;p=clitk.git

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

f6381b1392a2b4e14510a5a646386d76a2823f76