From: mayeut <mayeut@users.noreply.github.com>
Date: Tue, 6 Oct 2015 18:54:16 +0000 (+0200)
Subject: Merge branch 'master' into travis-matrix
X-Git-Tag: v2.1.1~22^2~41^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26b2728c493d30c2ecc058e775cbc8c86c158e88;p=openjpeg

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

26b2728c493d30c2ecc058e775cbc8c86c158e88