From: maxime Pech <maxime.pech@insa-lyon.fr>
Date: Thu, 26 May 2011 13:17:55 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~340^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3dd468aa18eed3a46d33483f288bfda2938ddee3;p=clitk.git

Merge branch 'master' of /home/dsarrut/clitk3.server
---

3dd468aa18eed3a46d33483f288bfda2938ddee3