]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:57:46 +0000 (13:57 -0800)
committerAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:57:46 +0000 (13:57 -0800)
commit79131b46176d136743274f802cfc87418c4294db
tree005b4ce5bfe5523e7ed324246087836da6a37eba
parent3add3491b3c0d48aa5278163664e5dc66c024419
parent0e985d372692e13b9b777b5eae5572e028f1d96a
Merge branch 'PHP-5.4' into PHP-5.5

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