From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Thu, 9 Jun 2011 09:22:51 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~321^2~3^2~2^2~1
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=274bf49f4b2781c521ddc04c0fc77ac43f2f2b82;p=clitk.git

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

274bf49f4b2781c521ddc04c0fc77ac43f2f2b82