granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 692b3bc a331f43)

author	Xinchen Hui <laruence@php.net>
	Wed, 30 May 2012 06:43:55 +0000 (14:43 +0800)
committer	Xinchen Hui <laruence@php.net>
	Wed, 30 May 2012 06:43:55 +0000 (14:43 +0800)
commit	7511f972fdc395c4770896576bb8752370e46c21
tree	3f36fc6003513497615d83cf68f85a6c29d65609	tree \| snapshot
parent	692b3bcd88ece3eefbc5131ecdf971ff18f191cf	commit \| diff
parent	a331f43f8cc8f2b9c23ddee95632b765e2e440e5	commit \| diff

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Typofix in comment in proc_open.c

ext/standard/proc_open.c

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