]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ec70a8 a07d76c)
Merge branch 'PHP-5.4'
authorJerome Loyet <fat@php.net>
Wed, 23 May 2012 09:32:02 +0000 (11:32 +0200)
committerJerome Loyet <fat@php.net>
Wed, 23 May 2012 09:32:02 +0000 (11:32 +0200)
* PHP-5.4:
  - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)


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