]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 13 Mar 2015 15:29:39 +0000 (16:29 +0100)
committerNikita Popov <nikic@php.net>
Fri, 13 Mar 2015 15:29:39 +0000 (16:29 +0100)
commit3cd6a9845d2ef42ce6caff86a01b03cf99835e30
tree84153b899d7653e050fa9b8b255c6eff12010515
parent2b42d719084631d255ec7ebb6c2928b9339915c2
parent4b930e156f161d3e9f7526fd9ba840923833a316
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_generators.c
Zend/zend_generators.h