]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Tue, 14 Jun 2016 20:38:44 +0000 (22:38 +0200)
committerNikita Popov <nikic@php.net>
Tue, 14 Jun 2016 20:38:44 +0000 (22:38 +0200)
commit93f7939891e11f84bd8448f464e38d9b43e3f818
tree369b13f839a4ffb6e6f5660fef20a9d55912bb0b
parent49b1290617b1500f70bd64de6732d9e23c4cb2e8
parent248fdfcf7356f2c20ab1e6afd1e9f295d08331c7
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/date/php_date.c
ext/date/php_date.c