From: Romulo Pinho <pinho@lyon.fnclcc.fr>
Date: Tue, 7 Jun 2011 08:04:11 +0000 (+0200)
Subject: Merge branch 'master' into blutdirmaster
X-Git-Tag: v1.3.0~330
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d83d2456795de427652e79600aff8aac47511a7e;p=clitk.git

Merge branch 'master' into blutdirmaster
---

d83d2456795de427652e79600aff8aac47511a7e