]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorXinchen Hui <laruence@php.net>
Tue, 5 Nov 2013 11:29:13 +0000 (19:29 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 5 Nov 2013 11:29:13 +0000 (19:29 +0800)
commit6c8ff0031cadb3164bfa77939fd07e4689520f44
tree40223893bebed271b54ce0a354adc09a3d091867
parent2a94494b7e87a93f34dad608139aceb970860166
parent63dba7ec9d7ce1ec5e2d48742c71ce66db973b93
Merge branch 'PHP-5.5'

Conflicts:
ext/phar/phar_internal.h
ext/phar/stream.c
ext/phar/util.c
ext/phar/phar.c
ext/phar/util.c