From: Benoît Presles <benoit.presles@netcourrier.com>
Date: Fri, 13 Jul 2012 14:31:20 +0000 (+0200)
Subject: Merge branch 'master' of git://git.creatis.insa-lyon.fr/clitk
X-Git-Tag: v1.4.0~281^2~15^2~5
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e4df7fea16df0710b014c7fd206086e5fdce0aa8;hp=e4df7fea16df0710b014c7fd206086e5fdce0aa8;p=clitk.git

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