From: mayeut <mayeut@users.noreply.github.com>
Date: Thu, 8 Oct 2015 17:11:52 +0000 (+0200)
Subject: Merge branch 'master' into coc-qcc
X-Git-Tag: v2.1.1~22^2~2^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3259fe2ff86637d956715e1f6e7f18b1acf4a30f;p=openjpeg

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

3259fe2ff86637d956715e1f6e7f18b1acf4a30f