From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Wed, 12 Jun 2013 14:33:34 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~206^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ebdb05ef36e1f579a451171e691cd71d640f849c;hp=ebdb05ef36e1f579a451171e691cd71d640f849c;p=clitk.git

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