From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Thu, 31 Oct 2013 15:47:25 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~155
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8b5dadbe47d0e7e314313055b1b1bc165109d322;p=clitk.git

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

8b5dadbe47d0e7e314313055b1b1bc165109d322