From: mayeut <mayeut@users.noreply.github.com>
Date: Fri, 9 Oct 2015 20:16:37 +0000 (+0200)
Subject: Merge branch 'master' into travis-abi
X-Git-Tag: v2.1.1~22^2~34^2~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4123c0ba864fbe0cb52746c4aac18a15c31b1f62;p=openjpeg

Merge branch 'master' into travis-abi
---

4123c0ba864fbe0cb52746c4aac18a15c31b1f62