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

Merge branch 'PHP-5.4'

* PHP-5.4:
  - fix help message for '-R'
  - Fixed bug #61835 (php-fpm is not allowed to run as root)
---

3ec70a895eb79be4696c34e8bb6ee0b1c4e2bce8