Merge remote-tracking branch 'php/master'

diff --cc package.xml
index 2eac6d7ffa1f01d3b461c392316d10763b5474a2,6033e788af34166d1f5aaf2f05359fc52ef27b8f..5dbc3fbd593a285058b1b5c239569a808c01898e
--- 1/package.xml
--- 2/package.xml
+++ b/package.xml
@@@ -37,14 -37,9 +37,15 @@@ http://pear.php.net/dtd/package-2.0.xsd
     <file role="doc" name="CREDITS" />
     <file role="doc" name="LICENSE" />
     <file role="src" name="config.m4" />
+    <file role="src" name="config.w32" />
     <file role="src" name="php_raphf.h" />
     <file role="src" name="php_raphf.c" />
 +   <dir name="tests">
 +    <file role="test" name="http001.phpt" />
 +    <file role="test" name="http002.phpt" />
 +    <file role="test" name="http003.phpt" />
 +    <file role="test" name="http004.phpt" />
 +   </dir>
    </dir>
   </contents>
   <dependencies>