From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Wed, 6 Jul 2011 11:39:26 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~300
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f3c961676689a38cca96888462ddb9689d9e0217;p=clitk.git

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

f3c961676689a38cca96888462ddb9689d9e0217