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)
* PHP-5.6:
  NEWS
  Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer


Trivial merge