]> granicus.if.org Git - php/commit
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)
commit2cdcf3e877809724a76130e699062d543e2c5234
tree388ab4622d699c387eecbc5244438e305d096012
parentec19c906bb2c35e286e05be0d47a57e3aee15313
parentf3f22ff5c697aef854ffc1918bce708b37481b0f
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files