From: mayeut <mayeut@users.noreply.github.com>
Date: Mon, 5 Oct 2015 19:49:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'uclouvain/master'
X-Git-Tag: v2.1.1~22^2~41^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b6a592372d6360ec64b8d1364b6ee56a1dd2a5f;p=openjpeg

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

0b6a592372d6360ec64b8d1364b6ee56a1dd2a5f