Fixed #67694: Regression in session_regenerate_id()
this test depends on the simplexml ext, not just on xml
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  this test depends on the simplexml ext, not just on xml
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  this test depends on the simplexml ext, not just on xml
Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
Bug #67850: Build when OpenSSL compiled without SSLv3 support
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
	ext/openssl/xp_ssl.c
Update NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS
better heading for UPGRADING.INTERNALS
update the GIT-RULES with the 5.6 and the release branches
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update the GIT-RULES with the 5.6 and the release branches
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update the GIT-RULES with the 5.6 and the release branches
remove the -dev suffix from the Zend version
update NEWS to reflect what makes into 5.6.0 final
from now on, this should be 5.6.1-dev
almost forgot to bump this
add the NEWS entries from the last stable release