From: Antonin Descampe <antonin@gmail.com>
Date: Fri, 13 May 2016 10:05:59 +0000 (+0200)
Subject: Merge branch 'master' into openjpeg-2.1
X-Git-Tag: v2.1.1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58320d2f3ba8aad624665058ec347a2a7622eb6d;p=openjpeg

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

58320d2f3ba8aad624665058ec347a2a7622eb6d