]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorFerenc Kovacs <tyrael@php.net>
Wed, 14 Oct 2015 22:55:52 +0000 (00:55 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 14 Oct 2015 22:55:52 +0000 (00:55 +0200)
* PHP-7.0:
  prepare for 5.6.15RC1


Trivial merge