From: Remi Collet <remi@php.net>
Date: Mon, 17 Nov 2014 08:43:26 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~55^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c996a9899ed3fbabb2435257891f67c70797aec6;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update fpm configuration for #68428
  fix incompatible pointer types
---

c996a9899ed3fbabb2435257891f67c70797aec6