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

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

c86827952f68c52d082dc22704f7c786c037c3be