zip extension version 1.12.4
Merge branch 'PHP-5.6'

* PHP-5.6:
  zip extension version 1.12.4
Add new INI for rollbacking connections put back into the pconn pool
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Merge branch 'PHP-5.6'

Conflicts:
	NEWS
	ext/openssl/xp_ssl.c
Merge branch 'master' of git.php.net:php-src

Conflicts:
	ext/openssl/xp_ssl.c
Merge remote-tracking branch 'origin/master' into str_size_and_int64

Conflicts:
	ext/mysqli/php_mysqli_structs.h
fix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04
Merge remote-tracking branch 'origin/master' into str_size_and_int64
after merge fix