]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@gmail.com>
Mon, 30 Mar 2015 12:20:55 +0000 (20:20 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 30 Mar 2015 12:20:55 +0000 (20:20 +0800)
commitab4f120c6a3594cc1257eaae9fd22a6a84613b02
tree2930a564c0fb4a2e30263d881ab9dc15d65cf5a0
parent3ad9ff197df21bb375a0c804964330b185fdd821
parent3a660bf3a5a73c10e05eccfcdf26d978f585f0af
Merge branch 'PHP-5.6'

Conflicts:
NEWS
ext/opcache/Optimizer/pass1_5.c
ext/phar/phar_internal.h
ext/phar/tar.c