]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.5:
  Fix for #66048

1  2 
main/main.c
main/php_open_temporary_file.c

diff --cc main/main.c
Simple merge
Simple merge