From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Mon, 6 Jun 2011 14:26:12 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~321^2~3^2~2^2~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4e8939cad4521503fc448378dd148373bd4d129e;p=clitk.git

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

4e8939cad4521503fc448378dd148373bd4d129e