From: mayeut <mayeut@users.noreply.github.com>
Date: Wed, 6 Jan 2016 16:09:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'uclouvain/master'
X-Git-Tag: v2.1.1~22^2~5^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83e5e2703ed66bdf4afbefd607263193a2ac1a98;p=openjpeg

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

83e5e2703ed66bdf4afbefd607263193a2ac1a98