Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update fpm configuration for #68428
  fix incompatible pointer types
This commit is contained in:
Remi Collet committed 2014-11-17 09:43:26 +01:00
commit c996a9899e

Diff Content Not Available