This commit was manufactured by cvs2svn to create tag 'NEWS'.
Fixed timestamp update on Phar contents modification.
Fixed timestamp update on Phar contents modification.
Fixed Bug #64340  (sockets tests failed) Patch by Reeze

Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.
Fixed bug #64290 (behavior change of converting to long)

convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
Fix test after the convert_to_long be improved, see #64290
Fix test (skip on unable to create socket)
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
- Updated to version 2013.1 (2013a)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
merged PCRE 8.32

- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  merged PCRE 8.32
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Merge branch 'PHP-5.3' into PHP-5.4
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  merged PCRE 8.32
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.