granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4e2ae5f d3a053d)

author	Anatol Belski <ab@php.net>
	Fri, 3 Jan 2014 21:38:47 +0000 (22:38 +0100)
committer	Anatol Belski <ab@php.net>
	Fri, 3 Jan 2014 21:38:47 +0000 (22:38 +0100)
commit	f0100261e15c423ffe2307ce1aaae10522380263
tree	1170e263e9c418db25a514ca321f0002273c6ebd	tree \| snapshot
parent	4e2ae5f5ca1165c6efa5450196e24d5b6f116e2f	commit \| diff
parent	d3a053d9f4ef8c24b6a1b529e7d8798144b98557	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

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

ext/standard/string.c

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