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

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

f7dbcf15128e4beda0b5894e0b9f16dcc23cfbe6