Merge branch 'PHP-5.6'

author Remi Collet <remi@php.net>

Thu, 5 Jun 2014 15:46:21 +0000 (17:46 +0200)

committer Remi Collet <remi@php.net>

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

index 740047a86ad82bf1192a246e43cf0df306d8b377,7a174c47c2a034ac3718cf364cde66569d72b0d7..740047a86ad82bf1192a246e43cf0df306d8b377

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