From: David Sarrut <david.sarrut@gmail.com>
Date: Tue, 18 Oct 2011 05:54:59 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~180^2~9
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f2db63f3bfa350d3267598e5630af09c34edd79e;p=clitk.git

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

f2db63f3bfa350d3267598e5630af09c34edd79e