Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

Conflicts:
	NEWS
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed segfault in mysqlnd when doing long prepare
- Updated to version 2013.4 (2013d)
Merge branch 'PHP-5.4' into PHP-5.5