From: DRC <information@libjpeg-turbo.org>
Date: Wed, 29 Nov 2017 20:36:39 +0000 (-0600)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c05d124968b36631a2f9899436f9e11180a2e28e;p=libjpeg-turbo

Merge branch 'master' into dev
---

c05d124968b36631a2f9899436f9e11180a2e28e