From: DRC <information@libjpeg-turbo.org>
Date: Mon, 11 Jul 2016 18:11:25 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b331385e8ae1395fa82b54f1f1750d1d868d111f;p=libjpeg-turbo

Merge branch 'master' into dev
---

b331385e8ae1395fa82b54f1f1750d1d868d111f