]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1b1ef0 4d9c556)
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Wed, 26 Feb 2014 14:10:23 +0000 (15:10 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 26 Feb 2014 14:10:23 +0000 (15:10 +0100)
* PHP-5.4:
  add news entry
  add clear_env option to FPM config


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