From: Jerome Loyet <fat@php.net>
Date: Wed, 23 May 2012 09:32:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9438b2c401e6c440a0b2de0bf379c34dd809289a;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
---

9438b2c401e6c440a0b2de0bf379c34dd809289a