]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 19 Nov 2014 15:48:21 +0000 (16:48 +0100)
committerRemi Collet <remi@php.net>
Wed, 19 Nov 2014 15:48:21 +0000 (16:48 +0100)
commit4a36482378373aa5dc584213f100f92525f50eb4
tree692f31ce5fba170b81f10165fb7ab0e92e43ff81
parentc40e665ecd32806c2b01e601867a788dd324dc1f
parentd438bcf2266ee1ddc56901fab65e022573874594
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
  NEWS
  Fixed bug #68381 Set FPM log level earlier during init