]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0180912 f767451)
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Wed, 19 Nov 2014 22:21:34 +0000 (23:21 +0100)
committerAnatol Belski <ab@php.net>
Wed, 19 Nov 2014 22:21:34 +0000 (23:21 +0100)
* origin/master:
  NEWS
  Fix #68355: Inconsistency in example php.ini comments
  NEWS
  Fixed bug #68452 php-fpm man page is oudated (-O)
  NEWS
  Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
  NEWS
  Fixed bug #68381 Set FPM log level earlier during init


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.