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

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

bacc49dae8fbb11fc2cf9d78fcefa94691f9ebfe