]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Wed, 30 Mar 2016 23:38:38 +0000 (01:38 +0200)
committerAnatol Belski <ab@php.net>
Wed, 30 Mar 2016 23:38:38 +0000 (01:38 +0200)
* PHP-7.0:
  fix borked mainstream patch
  5.5.35 now


Trivial merge