]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:09:29 +0000 (11:09 +0200)
committerRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:09:29 +0000 (11:09 +0200)
commite61f7727d455e50b69111a6f0d90e54cc79d6947
treec064c0e4daed4d3b0efc111e541a7190dc8eeaac
parent6538dab85ff872bc955b64a9aaf63ad5d9a3848a
parentf5333418d7e516ee55cdf29257fa216bf563fa26
Merge branch 'PHP-5.5' into PHP-5.6

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