]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 16 Jun 2013 23:56:38 +0000 (16:56 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 16 Jun 2013 23:56:38 +0000 (16:56 -0700)
* PHP-5.5:
  Fix bug #64764: Add status option to fpm init.d script


Trivial merge