From: Christopher Jones <sixd@php.net>
Date: Fri, 30 Aug 2013 12:40:30 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.4RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8b0da6ef74100b476379ba40367c30564da6582;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Update NEWS
  Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
---

c8b0da6ef74100b476379ba40367c30564da6582