From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Mon, 3 Sep 2012 10:51:51 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~281^2~16
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5c614f89dec012c7e8fee33c09fe7c1b955f5640;p=clitk.git

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

5c614f89dec012c7e8fee33c09fe7c1b955f5640