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

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

5b6ff103bd0d18eeeae3a0e74b8fa9eb45d55a89