]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:09:04 +0000 (11:09 +0200)
committerRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:09:04 +0000 (11:09 +0200)
commit2d59b87527f1df6101f56e99c20a687afb19b281
treea70891fdf7a258a97ae4a0c8b2409fb7ed42d30a
parent0218e4eb19c080d131c2b4d75ef9543e0e12c146
parent21986f98dbdc4e4dc556bb5f006d8fc8bbaebbe2
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check