fix heap overflow warnings on win x64 debug crt
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix heap overflow warnings on win x64 debug crt
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix heap overflow warnings on win x64 debug crt
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix heap overflow warnings on win x64 debug crt
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
Merge branch 'PHP-5.5'

* PHP-5.5:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
Fixed bug #64830 mimetype detection segfaults on mp3 file
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64830 mimetype detection segfaults on mp3 file
updated NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  Fixed bug #64830 mimetype detection segfaults on mp3 file
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
updated libmagic.patch after fix for #64830
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch after fix for #64830
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated libmagic.patch after fix for #64830
Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C
Merge branch 'PHP-5.5'

Conflicts:
	NEWS