From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Fri, 10 Jan 2014 10:15:18 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~145
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9dfed934fdeca8343992272c4292a8c7ed755329;p=clitk.git

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

9dfed934fdeca8343992272c4292a8c7ed755329