granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 47c9027 46f60fa)

author	Anatol Belski <ab@php.net>
	Fri, 3 Jan 2014 21:32:39 +0000 (22:32 +0100)
committer	Anatol Belski <ab@php.net>
	Fri, 3 Jan 2014 21:32:39 +0000 (22:32 +0100)
commit	d3a053d9f4ef8c24b6a1b529e7d8798144b98557
tree	dcdcc403207a5d3b56128ffaee5516d14be67002	tree \| snapshot
parent	47c902777297ce895aa915c13efdb00881af3669	commit \| diff
parent	46f60fae22b420320f3616e00928d70706cf4f4c	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #66395 basename function doesn't remove drive letter

ext/standard/string.c

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