From: mpech <maxime.pech@insa-lyon.fr>
Date: Wed, 29 Jun 2011 11:34:41 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~300^2^2~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1a8450d4940e31424315290bec3139418aadd87c;p=clitk.git

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

1a8450d4940e31424315290bec3139418aadd87c