]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b2f4e68 72f3457)
Merge branch 'fuckgit' into PHP-5.4
authorJerome Loyet <fat@php.net>
Thu, 27 Sep 2012 23:19:01 +0000 (01:19 +0200)
committerJerome Loyet <fat@php.net>
Thu, 27 Sep 2012 23:19:01 +0000 (01:19 +0200)
commitbe043ab6d00e9747727aefcb0dde12a40ddb4e8d
tree346663e94b21ff7039a82084e5431f3f352085b5tree | snapshot
parentb2f4e686f0947217ee70953ecbafa84f173770c2commit | diff
parent72f3457161aaf8c6bd0980aff855beca20d63404commit | diff
Merge branch 'fuckgit' into PHP-5.4

* fuckgit:
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - Fixed bug #63085 (Systemd integration and daemonize)

Conflicts:
sapi/fpm/config.m4
sapi/fpm/config.m4 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.