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

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

80be580d50c5defd2f4628b9c4ae3dad4e7c6ef0