From: ctorres <carlos.torres@creatis.insa-lyon.fr>
Date: Mon, 12 May 2014 16:00:52 +0000 (+0200)
Subject: Merge branch 'origin/master'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=18f3f2238cb97854f590dd8af0e9ab2a07de77a6;p=bbtk.git

Merge branch 'origin/master'
---

18f3f2238cb97854f590dd8af0e9ab2a07de77a6