From: DRC <information@libjpeg-turbo.org>
Date: Fri, 21 Oct 2016 00:17:30 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a949da48daa23c54e78f4d76472ecefaf8468104;p=libjpeg-turbo

Merge branch 'master' into dev
---

a949da48daa23c54e78f4d76472ecefaf8468104