From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 19 Nov 2012 11:02:48 +0000 (+0100)
Subject: Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~239^2~13
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c7f88ac1c53bedf4c01562761bf1bd3c91773181;p=clitk.git

Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk
---

c7f88ac1c53bedf4c01562761bf1bd3c91773181