granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 26471eb b6f5cb1)

author	Ferenc Kovacs <tyrael@php.net>
	Tue, 7 Jul 2015 13:49:44 +0000 (15:49 +0200)
committer	Ferenc Kovacs <tyrael@php.net>
	Tue, 7 Jul 2015 13:49:44 +0000 (15:49 +0200)
commit	bdb9c0da86780b803bc85d3c721d14fbfa5316bb
tree	aa96822ad96ec95ec748920a389ff40c0ec2ed68	tree \| snapshot
parent	26471eb69c3cd9e8162ff3b398d33919d9075191	commit \| diff
parent	b6f5cb11a4482e678bb4fb0a09f1e2fb6ec4190f	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add missing second argument for ucfirst to the proto

ext/standard/string.c

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