]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:58:19 +0000 (13:58 -0800)
committerAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:58:19 +0000 (13:58 -0800)
* PHP-5.5:
  Revert unintentional docblock change

1  2 
ext/curl/interface.c

Simple merge