From: Stanislav Malyshev <stas@php.net>
Date: Sun, 16 Jun 2013 23:56:38 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~434
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b3d31c1c311675649347b650c88604d1dc01f28;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #64764: Add status option to fpm init.d script
---

8b3d31c1c311675649347b650c88604d1dc01f28