]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:22:15 +0000 (17:22 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:22:15 +0000 (17:22 -0700)
* PHP-5.6:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c


Trivial merge