Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Wed, 22 Oct 2014 13:27:54 +0000 (15:27 +0200)
committerRemi Collet <remi@php.net>
Wed, 22 Oct 2014 13:27:54 +0000 (15:27 +0200)
commitd8686473c22695700115f2fbe8a9656b2ebcbf40
tree13307438ae7760a33d71ef5aa814270b366dba8b
parent534d854fb253f077f99d895680bc2842a5bdd79c
parent411984c0e9402a4e7c2d2d0cf23069f9eef60860
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer