]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Thu, 11 Jun 2015 18:31:22 +0000 (20:31 +0200)
committerFerenc Kovacs <tyrael@php.net>
Thu, 11 Jun 2015 18:31:22 +0000 (20:31 +0200)
* PHP-5.6:
  this is in 5.6.10, not in 5.6.9


Trivial merge