]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Mon, 9 Sep 2013 12:43:28 +0000 (05:43 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 9 Sep 2013 12:43:28 +0000 (05:43 -0700)
* 'master' of https://git.php.net/repository/php-src:
  ensure that the defined interpolation method is used by the generic scaling functions
  Fixed issue #128 (opcache_invalidate segmentation fault)
  5.5.5 now


Trivial merge