granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 69b5ee6 d8ff8f6)

author	Adam Harvey <aharvey@php.net>
	Fri, 2 May 2014 17:25:42 +0000 (10:25 -0700)
committer	Adam Harvey <aharvey@php.net>
	Fri, 2 May 2014 17:25:42 +0000 (10:25 -0700)
commit	fbb0c4b8001bb6b57164d00337725aae9291cf44
tree	dc6daf74c289bd1d63cca705b6c65938c780bd9b	tree \| snapshot
parent	69b5ee61d029b5532cd47ccae6ab0546b6d53106	commit \| diff
parent	d8ff8f6f203a685dd831e3caf59c1729c74e7c40	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix author name on the #63228 patch.

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