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

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

e8efeb699b696aa952ed5301dc3d92629c2b57ec