From: Romulo Pinho <pinho@lyon.fnclcc.fr>
Date: Mon, 24 Oct 2011 14:57:49 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~179
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3de84bda64063da470fb7a12abd38c98ed14bfd3;p=clitk.git

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

3de84bda64063da470fb7a12abd38c98ed14bfd3