From e563e6bf1066a78d555dceba052bf9f2166271a1 Mon Sep 17 00:00:00 2001
From: zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 1 Mar 2013 17:46:40 +0000
Subject: [PATCH] * array.c: typo in comment patch by Nami-Doc [Github fixes
 #253]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 array.c   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8b38879b0e..28fe91c8a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar  2 02:45:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c: typo in comment patch by Nami-Doc [Github fixes #253]
+
 Sat Mar  2 01:33:17 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
diff --git a/array.c b/array.c
index 6fda047e53..77807a55de 100644
--- a/array.c
+++ b/array.c
@@ -299,7 +299,7 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
 		    rb_ary_modify_check(ary);
 		}
 		else {
-		    /* if array is shared, than it is likely it participate in push/shift pattern */
+		    /* if array is shared, then it is likely it participate in push/shift pattern */
 		    rb_ary_modify(ary);
 		    capa = ARY_CAPA(ary);
 		    if (new_len > capa - (capa >> 6)) {