]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Tue, 9 Jun 2015 11:41:25 +0000 (13:41 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 9 Jun 2015 11:41:25 +0000 (13:41 +0200)
* PHP-5.6:
  these will be part of 5.6.11


Trivial merge