From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Thu, 13 Mar 2014 13:03:46 +0000 (+0100)
Subject: Merge branch 'origin/master'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=853145b6d183053afaee1e6f77a66426fea246f1;p=bbtk.git

Merge branch 'origin/master'
---

853145b6d183053afaee1e6f77a66426fea246f1