backported some ext/intl tests from 5.6 into 5.4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
	ext/intl/tests/collator_get_sort_key_variant2.phpt
	ext/intl/tests/locale_get_display_name3.phpt
Add test
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
ws fix
Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66942: openssl_seal() memory leak
  ws fix

Conflicts:
	ext/openssl/openssl.c
fix windows build
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix windows build
Fix test - on CI somebody could create a process in the meantime
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test - on CI somebody could create a process in the meantime
5.5.12RC1 setup
5.4.29 is next
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.29 is next

Conflicts:
	configure.in
	main/php_version.h
Fixed bug #67079 Missing MIME types for XML/XSL files