From: mayeut <mayeut@users.noreply.github.com>
Date: Fri, 5 Jun 2015 18:42:57 +0000 (+0200)
Subject: Merge branch 'master' into issue-254
X-Git-Tag: v2.1.1~22^2~118^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7535d084e1619f957f23bd18284dc3f3214165f;p=openjpeg

Merge branch 'master' into issue-254
---

c7535d084e1619f957f23bd18284dc3f3214165f