From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Sat, 20 Dec 2014 23:50:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtkGEditor
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6175f5e27f2597deedac398b27df03418e4e3478;hp=-c;p=bbtkGEditor.git

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

6175f5e27f2597deedac398b27df03418e4e3478