From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Tue, 3 May 2011 16:36:17 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.2.0^0
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=86c83f6c6ee7e1645f638f32d7ad4811122ec00b;p=clitk.git

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

86c83f6c6ee7e1645f638f32d7ad4811122ec00b