From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Wed, 16 Nov 2011 10:52:55 +0000 (+0100)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~170
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2c99c542733ba463090e72e88f363cb9fca46027;p=clitk.git

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

2c99c542733ba463090e72e88f363cb9fca46027