Fix windows build
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix windows build
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix windows build
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
Fixed bug #64604
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64604
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #64604
Merge branch 'pull-request/518' into PHP-5.4

* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)
fix NEWS
MErge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix NEWS
Fixed bug #67033 Remove reference to Windows 95
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67033 Remove reference to Windows 95