From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Mon, 17 Oct 2016 07:13:39 +0000 (+0200)
Subject: Merge branch 'master' into PacsConnection
X-Git-Tag: v1.4.0~2^2~1
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=488e466e7493439cb170bc263b4fb898f18183c1;p=clitk.git

Merge branch 'master' into PacsConnection
---

488e466e7493439cb170bc263b4fb898f18183c1