From: Leonardo Florez-Valencia <florez-l@javeriana.edu.co>
Date: Fri, 30 Oct 2015 23:09:30 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins
X-Git-Tag: v0.1~311
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8e5fd31fd4d280781d8bc27a799361bf9c30b1d4;p=cpPlugins.git

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

8e5fd31fd4d280781d8bc27a799361bf9c30b1d4