From: Thomas Greneir <thomas.grenier@insa-lyon.fr>
Date: Tue, 19 Sep 2017 15:11:33 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/STMS
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=STMS.git;a=commitdiff_plain;h=1f4c0dfb60a09872cbba3695b82af1365127ab68

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

1f4c0dfb60a09872cbba3695b82af1365127ab68