From: DRC <information@libjpeg-turbo.org>
Date: Wed, 5 Oct 2016 19:41:14 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed21f4bd03b976e927ac6a5f41f0fc52548ad3b2;p=libjpeg-turbo

Merge branch 'master' into dev
---

ed21f4bd03b976e927ac6a5f41f0fc52548ad3b2