Permalink
Browse files

Merge branch '5.3' into 5.4

Conflicts:
	main/output.c
  • Loading branch information...
2 parents 616d802 + 67bf07f commit f4873c68a600dcd0c6c548c9ecf2d605da878252 @cataphract cataphract committed Mar 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 ext/pcntl/pcntl.c
View
@@ -760,7 +760,7 @@ PHP_FUNCTION(pcntl_exec)
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argumnent list */
+ /* Build argument list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);

0 comments on commit f4873c6

Please sign in to comment.