]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Sun, 5 Jan 2014 18:13:15 +0000 (19:13 +0100)
committerAnatol Belski <ab@php.net>
Sun, 5 Jan 2014 18:13:15 +0000 (19:13 +0100)
* PHP-5.5:
  improved the fix for bug #66395
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012

1  2 
ext/standard/string.c

Simple merge