]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Thu, 9 Jul 2015 18:02:18 +0000 (20:02 +0200)
committerFerenc Kovacs <tyrael@php.net>
Thu, 9 Jul 2015 18:02:18 +0000 (20:02 +0200)
* PHP-5.6:
  move the use-after-free fixes to 5.6.11


Trivial merge