From: Stanislav Malyshev <stas@php.net>
Date: Tue, 27 May 2014 19:11:07 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~257^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13a3826687d270f6154c489244feffcecf33f838;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date
---

13a3826687d270f6154c489244feffcecf33f838
diff --cc NEWS
index 080e9c65b6,d37a9f17e4..82a1ce2af3
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,7 +1,10 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.14
 +?? ??? 2014, PHP 5.6.0 Beta 4
 +
++- Core:
++  . Fixed bug #67249 (printf out-of-bounds read). (Stas)
+ 
  - Date:
    . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
      (Adam)