Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 17 Nov 2014 08:43:26 +0000 (09:43 +0100)
committerRemi Collet <remi@php.net>
Mon, 17 Nov 2014 08:43:26 +0000 (09:43 +0100)
commitc996a9899ed3fbabb2435257891f67c70797aec6
tree2e83c7938b1e2ff8746d37b63857966792a25983
parentd9fd670fdc4a8096ce1877b2419edb04f60280c4
parent09f9f7ce5030973052bca5043425bd9f20ad7a7e
Merge branch 'PHP-5.5' into PHP-5.6

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