From: Jerome Loyet <fat@php.net>
Date: Thu, 27 Sep 2012 22:53:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~45^2~4^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e4c0b8142af8d2ca4999277a741534f020a488d;p=php

Merge branch 'PHP-5.4'

* 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)
---

9e4c0b8142af8d2ca4999277a741534f020a488d