]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af2c332 42b2d7f)
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Sun, 19 Jun 2016 05:11:23 +0000 (22:11 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 19 Jun 2016 05:11:23 +0000 (22:11 -0700)
* PHP-5.6:
  Fix bug #72447: Type Confusion in php_bz2_filter_create()

Conflicts:
ext/bz2/bz2_filter.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.