From: David Sarrut <david.sarrut@gmail.com>
Date: Mon, 3 Sep 2012 14:55:54 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~300
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d054b61c685c6fcdde2977b16036618c8ae853b9;p=clitk.git

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

d054b61c685c6fcdde2977b16036618c8ae853b9