]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Sun, 15 Jul 2012 01:53:30 +0000 (18:53 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 15 Jul 2012 01:53:30 +0000 (18:53 -0700)
* PHP-5.4:
  Fixed bug #61964 (finfo_open with directory cause invalid free)


Trivial merge