granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2f7aafe 142c40f)

author	Adam Harvey <aharvey@php.net>
	Wed, 16 Jan 2013 02:19:13 +0000 (10:19 +0800)
committer	Adam Harvey <aharvey@php.net>
	Wed, 16 Jan 2013 02:19:13 +0000 (10:19 +0800)
commit	77010bf9bf45c46d844b336c18cc8102cfc7e249
tree	53fc3ffdda02528c658517d360904afa9b3769ab	tree \| snapshot
parent	2f7aafe9929d843ae089a7072c5e6d9bd70c77ae	commit \| diff
parent	142c40f32c075a8eb706f2e630b934f39e711b70	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update the arguments in the prototype of fpm_socket_unix_test_connect().

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