granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eb012cf 896ac68)

author	Stanislav Malyshev <stas@php.net>
	Sun, 1 Jul 2012 00:00:25 +0000 (17:00 -0700)
committer	Stanislav Malyshev <stas@php.net>
	Sun, 1 Jul 2012 00:00:25 +0000 (17:00 -0700)
commit	a3322f8927618a8cadbef4ae2121084b44a564d3
tree	939a94efa58136e851e478e070daf89edaa18376	tree \| snapshot
parent	eb012cf88440423ff02c46421f29a1c6e850702c	commit \| diff
parent	896ac689c91967dec0601fa9fe048c518da52a3c	commit \| diff

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)

Zend/tests/offset_string.phpt	diff1 \|	diff2 \|	blob \| history
Zend/zend_compile.c	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli.c	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_loaddata.c	diff1 \|	diff2 \|	blob \| history
ext/pcntl/pcntl.c	diff1 \|	diff2 \|	blob \| history
ext/sqlite3/libsqlite/sqlite3.c	diff1 \|	diff2 \|	blob \| history
ext/standard/basic_functions.c	diff1 \|	diff2 \|	blob \| history

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