From: mayeut <mayeut@users.noreply.github.com>
Date: Mon, 20 Jul 2015 22:20:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'uclouvain/master' into issue-235
X-Git-Tag: v2.1.1~22^2~109^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bbb6070691ef40803a781610483892cb5984b69;p=openjpeg

Merge remote-tracking branch 'uclouvain/master' into issue-235
---

1bbb6070691ef40803a781610483892cb5984b69