From: Brent Huisman <brent.huisman@insa-lyon.fr>
Date: Tue, 15 Sep 2015 13:42:23 +0000 (+0200)
Subject: Merge branch 'master' of git://git.creatis.insa-lyon.fr/clitk
X-Git-Tag: v1.4.0~95
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=308795c2168452ab215acf39633f4cb8d3fc7e71;p=clitk.git

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

308795c2168452ab215acf39633f4cb8d3fc7e71