granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e3528f0 25c08a8)

author	Remi Collet <remi@php.net>
	Tue, 19 Nov 2013 11:42:25 +0000 (12:42 +0100)
committer	Remi Collet <remi@php.net>
	Tue, 19 Nov 2013 11:42:25 +0000 (12:42 +0100)
commit	87cabc04ac5081f032c55cdc67d541a92471964e
tree	4f1272bf510ae5b0f57205cb6601d074551b3a2f	tree \| snapshot
parent	e3528f086aba9796908e24dc6efdc970602ec023	commit \| diff
parent	25c08a839a261f3da77767934d8bed29f9831db3	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
avoid doing a stream_select on a closed stream

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