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

diff --cc NEWS
index 67c7b54891e050066f0b21670b5db95b7706a1f4,a059e075f2df2799224b3111b5d12df4067a09ba..9f11dcbb99628ddf33f1db58b44afe4027d688c4
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -22,9 -22,8 +22,12 @@@ PH
    . Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian).
      (Remi)
  
 -  . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf). 
+ - FPM:
++  . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
++
 +- mysqli:
 +  . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
 +    (extra comma) and third parameters (lack of escaping). (Andrey)
  
  - SimpleXML:
    . Fixed bug #66084 (simplexml_load_string() mangles empty node name)

diff --cc sapi/fpm/php-fpm.conf.in
Simple merge