]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sun, 20 Mar 2016 16:48:06 +0000 (17:48 +0100)
committerNikita Popov <nikic@php.net>
Sun, 20 Mar 2016 16:48:06 +0000 (17:48 +0100)
commit12f2665df829eac53e2036e335b40cf391ff8652
tree7e5aaf6a5a19415a7a416ff6aa36b02f80a5d66c
parenta175aa9dcaed5e295d015ff73c663e06c2335155
parentcc3cdd00578006a5684e6dfaf81532a13326b9fe
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/spl/spl_observer.c
NEWS
ext/spl/spl_observer.c