Merge branch 'PHP-5.5' into PHP-5.6

author Remi Collet <remi@php.net>

Thu, 5 Jun 2014 15:45:59 +0000 (17:45 +0200)

committer Remi Collet <remi@php.net>

Thu, 5 Jun 2014 15:45:59 +0000 (17:45 +0200)
author Remi Collet <remi@php.net>
Thu, 5 Jun 2014 15:45:59 +0000 (17:45 +0200)
committer Remi Collet <remi@php.net>
Thu, 5 Jun 2014 15:45:59 +0000 (17:45 +0200)
diff --cc UPGRADING

index 7a174c47c2a034ac3718cf364cde66569d72b0d7,510abcc7b6ca7becb23a4068850654a20f11f02d..7a174c47c2a034ac3718cf364cde66569d72b0d7

mode 100755,100644..100644
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
author	Remi Collet <remi@php.net>
	Thu, 5 Jun 2014 15:45:59 +0000 (17:45 +0200)
committer	Remi Collet <remi@php.net>
	Thu, 5 Jun 2014 15:45:59 +0000 (17:45 +0200)