Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (3) and Christopher Jones (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
Merge branch 'master' of https://git.php.net/repository/php-src

# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (5) and others
* 'master' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
Revert "Make 'make distclean' remove the downloaded pear PHAR"

This reverts commit d7baf0427fb56cbde55495e5c2071b1cdacb94ce.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
5.4.22-dev now
fix bug #65808 	the socket_connect() won't work with IPv6 address
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now

Conflicts:
	configure.in
	ext/sockets/sockets.c
	main/php_version.h
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now