From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Thu, 8 Dec 2011 13:20:35 +0000 (+0100)
Subject: Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.3.0~147
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=13b9b1bbed880af93318198be2a8c227f4e987f1;p=clitk.git

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

13b9b1bbed880af93318198be2a8c227f4e987f1