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

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

aced463099d763ade982dfc8425b23ecd6784ccd