From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 21 Mar 2014 14:28:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=bbtk.git;a=commitdiff_plain;h=00f00242cd642b58fc8281ad88c010656c519cbf

Merge remote-tracking branch 'refs/remotes/origin/master'
---

00f00242cd642b58fc8281ad88c010656c519cbf