From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Thu, 10 Nov 2011 15:11:58 +0000 (+0100)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~173
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=11d02d3d4012f1ac4a7652eaac626071e7c459ec;p=clitk.git

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

11d02d3d4012f1ac4a7652eaac626071e7c459ec