]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b42d71 4b930e1)
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)
Conflicts:
Zend/zend_generators.c
Zend/zend_generators.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.