From: Benoît Presles <benoit.presles@netcourrier.com>
Date: Tue, 23 Oct 2012 17:40:55 +0000 (+0200)
Subject: Merge branch 'master' of git://git.creatis.insa-lyon.fr/clitk
X-Git-Tag: v1.4.0~281^2~4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f8f487135ec75a4a88e1d325cad6375313b59a29;p=clitk.git

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

f8f487135ec75a4a88e1d325cad6375313b59a29