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


Trivial merge