]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Fri, 2 Oct 2015 14:20:23 +0000 (07:20 -0700)
committerXinchen Hui <laruence@gmail.com>
Fri, 2 Oct 2015 14:21:07 +0000 (07:21 -0700)
commit83fea9461eb5b37800201a66bb56b5379dd94203
treec5eb9d89aba9aeb4879f0e204ef4680abaa9911d
parent82857313620c83322ad54043b111fc7b120096e0
parentc98ea8465bd7a686cd7ee23c403b2f9dab6e3449
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/date/php_date.c
NEWS