]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 13:22:37 +0000 (14:22 +0100)
committerAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 13:22:37 +0000 (14:22 +0100)
commit5fe54dbaf9018496c0afcad8dde166ddbe587ff4
tree4a678ba5b88cdb9a835fd2828ab5b7205d28af38
parentb644dcfb72ddc436d626ad043b7c96b602de2d55
parentede59c8feb4b80e1b94e4abdaa0711051e2912ab
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #68735 fileinfo out-of-bounds memory access