]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJerome Loyet <fat@php.net>
Thu, 27 Sep 2012 22:53:43 +0000 (00:53 +0200)
committerJerome Loyet <fat@php.net>
Thu, 27 Sep 2012 22:53:43 +0000 (00:53 +0200)
* PHP-5.4:
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)


Trivial merge