]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:02:05 +0000 (10:02 +0100)
committerAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:02:05 +0000 (10:02 +0100)
* PHP-5.6:
  updated NEWS
  Fixed bug #68827 Double free with disabled ZMM

1  2 
ext/fileinfo/libmagic/apprentice.c

Simple merge