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

# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing & saving Makefile using Emacs.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
add some tracing
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Merge branch 'PHP-5.5'