From: Antonin Descampe <antonin@gmail.com>
Date: Mon, 25 Jan 2016 16:55:01 +0000 (+0100)
Subject: Merge branch 'master' into openjpeg-2.1
X-Git-Tag: v2.1.1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9701c1932380e7f74fdb203148fdb07c20759c3d;p=openjpeg

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

9701c1932380e7f74fdb203148fdb07c20759c3d