From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Tue, 3 May 2011 14:02:20 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.2.0~2^2~5
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fccfc9b0a6df74011a09eebe42ee50fc57e764de;p=clitk.git

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

fccfc9b0a6df74011a09eebe42ee50fc57e764de