Merge branch 'master' into dev

author DRC <information@libjpeg-turbo.org>

Tue, 20 Sep 2016 23:09:15 +0000 (18:09 -0500)

committer DRC <information@libjpeg-turbo.org>

Tue, 20 Sep 2016 23:09:15 +0000 (18:09 -0500)
author DRC <information@libjpeg-turbo.org>
Tue, 20 Sep 2016 23:09:15 +0000 (18:09 -0500)
committer DRC <information@libjpeg-turbo.org>
Tue, 20 Sep 2016 23:09:15 +0000 (18:09 -0500)
diff --cc BUILDING.md
Simple merge
diff --cc jmemmgr.c
Simple merge
diff --cc turbojpeg.c
Simple merge
author	DRC <information@libjpeg-turbo.org>
	Tue, 20 Sep 2016 23:09:15 +0000 (18:09 -0500)
committer	DRC <information@libjpeg-turbo.org>
	Tue, 20 Sep 2016 23:09:15 +0000 (18:09 -0500)
		1	2
BUILDING.md	patch \|	diff1 \|	diff2 \|	blob \| history
jmemmgr.c	patch \|	diff1 \|	diff2 \|	blob \| history
turbojpeg.c	patch \|	diff1 \|	diff2 \|	blob \| history