Merge branch 'master' into remove-mcrypt

author Leigh <leigh@php.net>

Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)

committer Leigh <leigh@php.net>

Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)
author Leigh <leigh@php.net>
Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)
committer Leigh <leigh@php.net>
Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
diff --cc win32/build/libs_version.txt

index ed9d68f83e72b18f29f40988cc24e9b3c9cb9392,716fad3c8b51f2fcc71e6622b39183aa1724ab91..9d3f9be79652ae2ac76a1bb882e8bedc9de9f637
--- 1/win32/build/libs_version.txt
--- 2/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -3,8 -3,9 +3,8 @@@ cclient-2007
   freetype-2.6.2
   icu-57.1
   jpeglib-9b
- libcurl-7.50.3
+ libcurl-7.51.0
   libiconv-1.14
- -libmcrypt-2.5.8
   libmpir-2.7.2
   libpng-1.6.21
   libpq-9.5.3
author	Leigh <leigh@php.net>
	Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)
committer	Leigh <leigh@php.net>
	Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history
win32/build/libs_version.txt	patch \|	diff1 \|	diff2 \|	blob \| history