From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 4 Nov 2011 09:44:56 +0000 (+0100)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~174
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d8f6cf956310ff7b123df4ad82e20b61831d09ff;p=clitk.git

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

d8f6cf956310ff7b123df4ad82e20b61831d09ff