From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Thu, 13 Jun 2013 12:45:45 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~206
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=857c9e74552dccd4c71364c15cca4ade140511fc;p=clitk.git

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

857c9e74552dccd4c71364c15cca4ade140511fc