From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Fri, 1 Feb 2013 16:00:35 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~248
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=02f230e65dbfde06e84da374bb085643e29b5090;p=clitk.git

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

02f230e65dbfde06e84da374bb085643e29b5090