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

* 'PHP-5.4' of git.php.net:php-src:
  Revert "Fixed reference counting"
  Fixed reference counting
Fixed bug #61423 (gzip compression fails).
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
BFN
Merge branch 'PHP-5.4'

* PHP-5.4:
  BFN
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
Fixed bug #61423 (gzip compression fails).

Conflicts:

	NEWS
Merge branch '5.4'

* 5.4:
  Fixed bug #61423 (gzip compression fails).
Fix NEWS
Merge branch 'PHP-5.4' of ../php-5.4

* 'PHP-5.4' of ../php-5.4:
  Add initialization tests for SQLT_INT binds
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src: (26 commits)
  Fixed bug #61423 (gzip compression fails).
  BFN
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Fixed reference counting
  Fixed reference counting
  Fixed reference counting
  Fix test, and merge the modification from trunk
  Ignore the tempoary files
  Fix test, which was broken by the fix for #61173
  Use the NEWS merge driver if available
  Made some SplFileObject::fputcsv not pollute the working dir.
  Fixed bug #61453.
  Fixed bug #49853 (Soap Client stream context header option ignored)
  Always keep the NEWS file from the branch when merging
  Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
  ...
Merge branch 'PHP-5.4' of /home/cjones/php-src into PHP-5.4

* 'PHP-5.4' of /home/cjones/php-src: (21 commits)
  Fixed bug #61423 (gzip compression fails).
  BFN
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Fixed reference counting
  Fixed reference counting
  Fix test, and merge the modification from trunk
  Ignore the tempoary files
  Fix test, which was broken by the fix for #61173
  Use the NEWS merge driver if available
  Made some SplFileObject::fputcsv not pollute the working dir.
  Fixed bug #61453.
  Fixed bug #49853 (Soap Client stream context header option ignored)
  Always keep the NEWS file from the branch when merging
  Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664
  ...
Add initialization tests for SQLT_INT binds

Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
Add initialization tests for SQLT_INT binds

Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
More changes to README
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4

* 'PHP-5.3' of ../php-5.3:
  More changes to README
  Add initialization tests for SQLT_INT binds
  Fix NEWS
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Add initialization tests for SQLT_INT binds
Merge branch 'PHP-5.4' of ../php-5.4

* 'PHP-5.4' of ../php-5.4:
  More changes to README
  Add initialization tests for SQLT_INT binds
  Fix NEWS
update for git
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482

This reverts commit 714f1ff4b37c5101b3c61ea108a3d415f41e50df.
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  Add initialization tests for SQLT_INT binds
  Fix NEWS