]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:58:48 +0000 (13:58 -0800)
committerAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:58:48 +0000 (13:58 -0800)
commit751aa92fe5a30ab7b97e3a0df097f61876dacd5d
treeb57bbb3f829499010c2cb481a3b7695802aa01a0
parent150dc69d6eee35738f505e925ee664c02060196d
parent381fd62ccf9ee6889c964c2be6cf1712a9ac4562
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert unintentional docblock change
ext/curl/interface.c