granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0e67973 79131b4)

author	Adam Harvey <aharvey@php.net>
	Fri, 5 Dec 2014 21:58:19 +0000 (13:58 -0800)
committer	Adam Harvey <aharvey@php.net>
	Fri, 5 Dec 2014 21:58:19 +0000 (13:58 -0800)
commit	381fd62ccf9ee6889c964c2be6cf1712a9ac4562
tree	c348e592e9f42ceb2f91d79e00e86572577e7643	tree \| snapshot
parent	0e67973e9a2707f0010ac9a65020f62b5cb104fb	commit \| diff
parent	79131b46176d136743274f802cfc87418c4294db	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Revert unintentional docblock change

ext/curl/interface.c

Unnamed repository; edit this file 'description' to name the repository.