]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyrael@php.net>
Mon, 18 Apr 2016 06:15:47 +0000 (08:15 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 18 Apr 2016 06:15:47 +0000 (08:15 +0200)
* PHP-5.6:
  prepare for 5.6.21RC1


Trivial merge