From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 12 Dec 2011 17:07:26 +0000 (+0100)
Subject: Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.3.0~145
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0793c4dd3d451bb9bdc00e3172fa792d1ddaa8dc;p=clitk.git

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

0793c4dd3d451bb9bdc00e3172fa792d1ddaa8dc