From: Antonin Descampe <antonin@gmail.com>
Date: Sat, 23 Jan 2016 18:51:16 +0000 (+0100)
Subject: Merge branch 'master' into openjpeg-2.1
X-Git-Tag: v2.1.1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c84747e580eee040d13f7806f209e34244a14b88;p=openjpeg

Merge branch 'master' into openjpeg-2.1
---

c84747e580eee040d13f7806f209e34244a14b88