Merge branch 'master' into dev

author DRC <information@libjpeg-turbo.org>

Wed, 14 Feb 2018 20:50:04 +0000 (14:50 -0600)

committer DRC <information@libjpeg-turbo.org>

Wed, 14 Feb 2018 20:50:04 +0000 (14:50 -0600)
author DRC <information@libjpeg-turbo.org>
Wed, 14 Feb 2018 20:50:04 +0000 (14:50 -0600)
committer DRC <information@libjpeg-turbo.org>
Wed, 14 Feb 2018 20:50:04 +0000 (14:50 -0600)
diff --cc README.md

index 80ba6c173d56b7ebb20af10e20337a833ee4ce22,74e6eac45a78b7c4817b2c85373c1673dfb3d5a2..80ba6c173d56b7ebb20af10e20337a833ee4ce22

mode 100755,100644..100644
--- 1/README.md
--- 2/README.md
+++ b/README.md
author	DRC <information@libjpeg-turbo.org>
	Wed, 14 Feb 2018 20:50:04 +0000 (14:50 -0600)
committer	DRC <information@libjpeg-turbo.org>
	Wed, 14 Feb 2018 20:50:04 +0000 (14:50 -0600)