From: Daniel Gonzalez <daniel.gonzalez@creatis.insa-lyon.fr>
Date: Fri, 26 Apr 2013 09:52:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9a0cff4a61edd2b20bc0d7d00f4509193b8c50b6;p=bbtk.git

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

9a0cff4a61edd2b20bc0d7d00f4509193b8c50b6