Fixed bug #68545 NULL pointer dereference in unserialize.c
move the test to the right place
update NEWS
Fixed memory leak introduced by 73458e8f
Fix undefined behaviour in strnatcmp
Fix undefined behaviour in strnatcmp
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c

Conflicts:
	NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
fix typo
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix typo
split fpm config to two parts. PR#903

main config = global options
secondary config = pool options

makes easier to add new pools:
duplicate pool config in fpm.d dir

https://bugs.php.net/bug.php?id=67106
Fix bug #67106 split main fpm config
Share HTTP status codes map
Merge branch 'unify_http'

* unify_http:
  Share HTTP status codes map
Fix indentation
Change is_long() to be an alias of is_integer()

@@ See internals: news.php.net/php.internals/79639
@@ Manual will be updated so that is_int() will be an alias of is_integer()
@@ I picked integer over int for consitentcy as we do not use str instead of string either
NEWS
Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github
NEWS