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

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

e975ca2832ecb012c1bd768c5d971eeb6032cbc4