From: mayeut <mayeut@users.noreply.github.com>
Date: Tue, 6 Oct 2015 18:48:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'uclouvain/master'
X-Git-Tag: v2.1.1~22^2~2^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e526d435cc874b97ae41eacc6b8b0b72419180fb;p=openjpeg

Merge remote-tracking branch 'uclouvain/master'
---

e526d435cc874b97ae41eacc6b8b0b72419180fb