]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 5 Apr 2016 09:24:23 +0000 (11:24 +0200)
committerAnatol Belski <ab@php.net>
Tue, 5 Apr 2016 09:24:23 +0000 (11:24 +0200)
commitd10a8e48047dd57f4c454d62720dcd57191e424e
tree75da5f8e853b49eac4dbef51a0ed5ee20afd113e
parent4090e709aa3505e414243d4e19e18804ea8371e4
parent1aea777349f8b86495d23ed7c8c71632c7555e55
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
ext/date/php_date.c