]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 15 Apr 2015 18:01:13 +0000 (20:01 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 15 Apr 2015 18:01:13 +0000 (20:01 +0200)
* PHP-5.6:
  66550 will be part of 5.6.8
  66550 will be part of 5.5.24


Trivial merge