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

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

56707942c9aad40a0023bf882320c6883054589f