From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Mon, 30 May 2011 17:18:28 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~321^2~3^2~8^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e168843d038efea6d865549cd5aef6901643dbf8;p=clitk.git

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

e168843d038efea6d865549cd5aef6901643dbf8