]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Tue, 3 Jun 2014 09:38:19 +0000 (11:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 3 Jun 2014 09:38:19 +0000 (11:38 +0200)
* PHP-5.6:
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files


Trivial merge