From: Benoît Presles <benoit.presles@netcourrier.com>
Date: Thu, 12 Apr 2012 07:18:03 +0000 (+0200)
Subject: Merge branch 'master' of git://git.creatis.insa-lyon.fr/clitk
X-Git-Tag: v1.4.0~281^2~15^2~12
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=faf73a151b8b24e5590a39d58dd69040f0ff1303;p=clitk.git

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

faf73a151b8b24e5590a39d58dd69040f0ff1303