granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e956ba9 b51f82f)

author	Adam Harvey <aharvey@php.net>
	Fri, 13 Jun 2014 01:15:07 +0000 (18:15 -0700)
committer	Adam Harvey <aharvey@php.net>
	Fri, 13 Jun 2014 01:15:07 +0000 (18:15 -0700)
commit	25464340087e0e6a2ff663b349630f4423fea033
tree	c174ffa2d8648fe6ed3ff33c477b72c936daba57	tree \| snapshot
parent	e956ba935765c410195a3d402aa9456d187472d6	commit \| diff
parent	b51f82f2607af220a197ce435a571b2e11cfbbfa	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Follow 308 Permanent Redirect responses.

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