From: Stephan Mühlstrasser <stm@pdflib.com>
Date: Wed, 21 Oct 2015 06:57:45 +0000 (+0200)
Subject: Merge branch 'master' into opj_aligned_malloc
X-Git-Tag: v2.1.1~22^2~20^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=540aa58f6c12224b5762f141fe71a2760e7c7766;p=openjpeg

Merge branch 'master' into opj_aligned_malloc

Conflicts:
	src/lib/openjp2/opj_malloc.c
---

540aa58f6c12224b5762f141fe71a2760e7c7766