]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Wed, 5 Aug 2015 07:01:10 +0000 (00:01 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 5 Aug 2015 07:01:10 +0000 (00:01 -0700)
* PHP-5.6:
  5.5.29 next


Trivial merge