From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Tue, 9 Aug 2011 08:49:30 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~240^2~4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2db65b693062a7d5bb04df546be45f9b9513997f;p=clitk.git

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

2db65b693062a7d5bb04df546be45f9b9513997f