From: Antonin Descampe <antonin@gmail.com>
Date: Sun, 15 May 2016 17:19:15 +0000 (+0200)
Subject: Merge branch 'master' into openjpeg-2.1
X-Git-Tag: v2.1.1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=788dff0a3650f8897eaafe951512a4bae63808dd;p=openjpeg

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

788dff0a3650f8897eaafe951512a4bae63808dd