5.5.17 now
Fix handling of multi-result sets with PS...used to clean not only
the result set but the whole PS.
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Add EXPECTF
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
	configure.in
	main/php_version.h
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
Use callback structure
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
	NEWS
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

Conflicts:
	NEWS
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
	configure.in
	main/php_version.h