]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 02:26:39 +0000 (18:26 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 02:26:39 +0000 (18:26 -0800)
* PHP-5.5:
  Fixes memory leak introduced in 2b9af967

1  2 
ext/date/php_date.c

Simple merge