From: David Sarrut <david.sarrut@gmail.com>
Date: Tue, 22 Nov 2011 15:47:33 +0000 (+0100)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~104^2~28
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1561fae3bf0756ba34e222cd1f189aac0087c62a;p=clitk.git

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

1561fae3bf0756ba34e222cd1f189aac0087c62a