]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorFerenc Kovacs <tyrael@php.net>
Wed, 16 Sep 2015 23:50:01 +0000 (01:50 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 16 Sep 2015 23:50:01 +0000 (01:50 +0200)
* PHP-7.0:
  prepare for PHP-5.6.14RC1


Trivial merge