]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bff128 d69513a)
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Fri, 30 Aug 2013 12:40:24 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 30 Aug 2013 12:40:24 +0000 (05:40 -0700)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)


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