From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 31 Aug 2012 09:38:18 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~281^2~18
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cd04d8c797defe2fdaff3d1fa09928b22dd6edc4;p=clitk.git

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

cd04d8c797defe2fdaff3d1fa09928b22dd6edc4