From: dsarrut <david.sarrut@gmail.com>
Date: Thu, 26 May 2011 14:15:29 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~338^2~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ea2fc85081a73d762517dc9663bcc6d5bf15241d;p=clitk.git

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

ea2fc85081a73d762517dc9663bcc6d5bf15241d