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

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

2e4fadf330c1039d2181e6ba05c80f1cff6d0947