Replace old SVN references to Git
mention ldap_modify_batch()
move the peer verification NEWS entry to the alpha2 block, as it was pushed after alpha1
Update NEWS and UPGRADING
a few typofixes
Merge branch 'PHP-5.4' into PHP-5.5
a few typofixes
Merge branch 'PHP-5.5' into PHP-5.6
a few typofixes
Merge branch 'PHP-5.6'
Fix segfault accessing context when no context assigned
Updated NEWS
Merge branch 'master' of git://git.php.net/php-src

* 'master' of git://git.php.net/php-src: (33 commits)
  a few typofixes
  a few typofixes
  a few typofixes
  Update NEWS and UPGRADING
  move the peer verification NEWS entry to the alpha2 block, as it was pushed after alpha1
  mention ldap_modify_batch()
  Implement RFC https://wiki.php.net/rfc/default_encoding
  update the alpha2 release date
  Fixed ZTS and added fix to NEWS.
  Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.
  Rename timelib_get_zone to timelib_parse_zone and export.
  Replace old SVN references to Git
  fix regex to detect valgrind version New PCRE version got stricter
  fix regex to detect valgrind version New PCRE version got stricter
  Fixed memory leak in pow operator
  5.5.9 now released
  Added information in NEWS and UPGRADING
  add T_POW (**) operator
  add NEWS block for 5.6.0alpha3
  updated libs_version.txt
  ...
Fix segfault accessing context when no context assigned

Conflicts:
	ext/openssl/xp_ssl.c
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix segfault accessing context when no context assigned

Conflicts:
	ext/openssl/xp_ssl.c
Fix test broken if openssl is compiled without sslv2
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix test broken if openssl is compiled without sslv2
Bug #47030 (separate host and peer verification)
Merge branch 'bug-47030' of https://github.com/rdlowrey/php-src into PHP-5.6

* 'bug-47030' of https://github.com/rdlowrey/php-src:
  Bug #47030 (separate host and peer verification)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #47030 (separate host and peer verification)