From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Tue, 27 May 2014 06:00:01 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~16^2~10^2~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1c314c7b44201bfa914c04cf406211c1b64ef5a4;p=clitk.git

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

1c314c7b44201bfa914c04cf406211c1b64ef5a4