]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Tue, 12 May 2015 14:12:51 +0000 (16:12 +0200)
committerJulien Pauli <jpauli@php.net>
Tue, 12 May 2015 14:12:51 +0000 (16:12 +0200)
commit2ddb560c2e31c71aaf77772e119c40f9087c3eda
treefbad5852331221cc8ea926f5be924e6ad8ef51a4
parente1cb22a23e881d13ddf80a90f1b0bf2d37913f75
parentc117548ea9365adac00960fe5f43425b2955310d
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix for #66048
main/main.c
main/php_open_temporary_file.c