From: mayeut <mayeut@users.noreply.github.com>
Date: Tue, 13 Oct 2015 19:57:58 +0000 (+0200)
Subject: Merge branch 'master' into coc-qcc
X-Git-Tag: v2.1.1~22^2~2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8d03fea9b2d1db0f2000718395a9f01c59a1e2f;p=openjpeg

Merge branch 'master' into coc-qcc
---

c8d03fea9b2d1db0f2000718395a9f01c59a1e2f