From: DRC <information@libjpeg-turbo.org>
Date: Tue, 20 Sep 2016 23:09:15 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c36568626b0b756f9ef77b379db471f8c06b21b;p=libjpeg-turbo

Merge branch 'master' into dev
---

6c36568626b0b756f9ef77b379db471f8c06b21b