Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:50:04 +0000 (07:50 +0100)
committerRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:50:04 +0000 (07:50 +0100)
* PHP-5.5:
  NEWS
  move zlog_set_level() again
  Change pm.start_servers default warning to notice


Trivial merge