]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f8fa47 9d0ca07)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:16:39 +0000 (14:16 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:16:39 +0000 (14:16 +0200)
commit1d6286c049cbe57877f12b17d38d3a55a7f7d36f
tree9b96291412eab86d0d5e1ed7499d390fcfc54f34tree | snapshot
parent7f8fa470f175fc46941d980b140f98d880200e4dcommit | diff
parent9d0ca077eea762e9d89523ec33c903525b39e16dcommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67411  fileinfo: cdf_check_stream_offset insufficient boundary check
ext/fileinfo/libmagic/cdf.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.