From: mayeut <mayeut@users.noreply.github.com>
Date: Sun, 13 Sep 2015 12:58:01 +0000 (+0200)
Subject: Merge branch 'master' into travis-matrix
X-Git-Tag: v2.1.1~22^2~41^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d32f11a6fa31303aa737433fd364c5fbb72c2d7;p=openjpeg

Merge branch 'master' into travis-matrix
---

7d32f11a6fa31303aa737433fd364c5fbb72c2d7