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

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

987f96004f53c039dbcb72bcaeef940676d1368d