Merge branch '5.3' into 5.4

Conflicts: main/output.c
reeze · Mar 29, 2012 · f4873c6 · f4873c6
2 parents 616d802 + 67bf07f
commit f4873c6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
@@ -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);