]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 9 Jun 2014 02:47:59 +0000 (19:47 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 9 Jun 2014 02:47:59 +0000 (19:47 -0700)
* PHP-5.6:
  update news
  add news
  Bug 49898 __getCookies() method implementation


Trivial merge