From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Wed, 8 Jun 2011 15:44:51 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~321^2~3^2~2^2~4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5d07c6f09eee2f55347c6722c16c1f81de28e747;p=clitk.git

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

5d07c6f09eee2f55347c6722c16c1f81de28e747