From: Remi Collet <remi@php.net>
Date: Fri, 30 Aug 2013 08:43:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.4RC1~3^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5749eb0cbe6edb91ba0d5d79bbeedaeabf3788a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
---

a5749eb0cbe6edb91ba0d5d79bbeedaeabf3788a