From: DRC <information@libjpeg-turbo.org>
Date: Fri, 5 Jan 2018 18:05:43 +0000 (-0600)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=289014d470410da01cfc2554a0fa191c0fba1abc;p=libjpeg-turbo

Merge branch 'master' into dev
---

289014d470410da01cfc2554a0fa191c0fba1abc