use $PHP_LIBDIR instread of "lib" in skel example
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  use $PHP_LIBDIR instread of "lib" in skel example
remove bogus locale use from test
only no_NO.ISO-8859-1 have to be ignored
update NEWS about the release date of 5.6.1
5.5.19 now
we also have xz release tarballs since 5.5
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  we also have xz release tarballs since 5.5
  5.5.19 now

Conflicts:
	configure.in
	main/php_version.h
Add hash to EXTENSIONS file
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add hash to EXTENSIONS file
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add hash to EXTENSIONS file
add IPv6 support to php-fpm
NEWS entry for previous commit
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS entry for previous commit
  add IPv6 support to php-fpm
NEWS entry for previous commit
Fix bug #68188
Merge branch 'PHP-5.5' into PHP-5.6
Fix bug number
Merge branch 'PHP-5.5' into PHP-5.6
Fixed a bug that causes crash when environment variable is access while parsing php.ini