From: mayeut <mayeut@users.noreply.github.com>
Date: Wed, 23 Sep 2015 19:20:11 +0000 (+0200)
Subject: Merge branch 'master' into travis-matrix
X-Git-Tag: v2.1.1~22^2~41^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09c35dcb84c56699318973a6cbc9eb31f64a0e18;p=openjpeg

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

09c35dcb84c56699318973a6cbc9eb31f64a0e18