]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0f6263 757e3fc)
Merge branch 'PHP-5.4'
authorJerome Loyet <fat@php.net>
Wed, 23 May 2012 08:37:36 +0000 (10:37 +0200)
committerJerome Loyet <fat@php.net>
Wed, 23 May 2012 08:37:36 +0000 (10:37 +0200)
* PHP-5.4:
  - fix help message for '-R'
  - Fixed bug #61835 (php-fpm is not allowed to run as root)


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