]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Sat, 20 Jun 2015 14:50:37 +0000 (16:50 +0200)
committerNikita Popov <nikic@php.net>
Sat, 20 Jun 2015 14:50:37 +0000 (16:50 +0200)
commit9589d26ef3d8500525729bcb78d2d9b1517e2134
treee67d79024abdcb10fe9b92a12abe42ea4c7c6db3
parentcc8f2b1bd9d81b03e3a266ae75853c24d1b1dd43
parente09d3155a172bdded3cfcff921f676be57ae8d5b
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_hash.c
NEWS
Zend/zend_hash.c