From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 26 Jul 2013 07:55:28 +0000 (+0200)
Subject: Merge branch 'master' into PacsConnection
X-Git-Tag: v1.4.0~2^2~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=299afce0c4c4cc3524dccecf4ecffd46d7a66328;p=clitk.git

Merge branch 'master' into PacsConnection
---

299afce0c4c4cc3524dccecf4ecffd46d7a66328