From 02e4d7a290ae437688b3a3d114621a1d32444560 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Mon, 10 Jun 2013 14:20:18 -0700
Subject: Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes
---
 ext/standard/tests/array/array_intersect_assoc_variation3.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/standard/tests/array/array_intersect_assoc_variation3.phpt')

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
index 50be080590..e3f0ae08ec 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
@@ -31,7 +31,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
-- 
cgit v1.2.1