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>
Merge branch 'PHP-5.6'

* PHP-5.6:
  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
master renames phase 1
master renames phase 2
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
Fix for C89
Update NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS
master renames phase 3
Merge branch 'master' of git.php.net:php-src

# By Daniel Lowrey
# Via Daniel Lowrey
* 'master' of git.php.net:php-src:
  Update NEWS
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
master renames phase 4
master renamings phase 5
master renames phase 6
master renames phase 7
Merge remote-tracking branch 'php-src/master' into ast

Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_globals.h
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_types.h
Merge branch 'ast'

Conflicts:
	Zend/zend_compile.c