From: David Sarrut <david.sarrut@gmail.com>
Date: Fri, 4 Nov 2011 09:36:31 +0000 (+0100)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~174^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1d616cc7be31f7195c8bba4142e02350cd2fb958;p=clitk.git

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

1d616cc7be31f7195c8bba4142e02350cd2fb958