Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Add support for gb18030/MySQL 5.7
Merge branch 'PHP-5.6'

Conflicts:
	NEWS
add NEWS block for 5.6.0RC2
Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS block for 5.6.0RC2
add missing entry to NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entry to NEWS
add missing entry to NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entry to NEWS
Merge branch 'master' of git://github.com/php/php-src