]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Mon, 17 Aug 2015 17:28:46 +0000 (19:28 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 17 Aug 2015 17:28:46 +0000 (19:28 +0200)
commit61591ea636313a8f3807fc5f4950b7917cbb85a4
treefe9d0585e8add5a9423505b073395321da9b288b
parentaae9004ebdf42fbebafa461902009a936285415c
parent3ed58fb5d76813860fa96c020174c223e3b6d63e
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70277: new DateTimeZone($foo) is ignoring text after null byte

Resolved conflicts:
ext/date/php_date.c
ext/date/php_date.c