]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Fri, 20 Mar 2015 13:41:22 +0000 (14:41 +0100)
committerFerenc Kovacs <tyrael@php.net>
Fri, 20 Mar 2015 13:41:22 +0000 (14:41 +0100)
* PHP-5.6:
  this already had an entry


Trivial merge