From d23a588b22bd01d925d846a7f84542a116358799 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Feb 2012 22:50:46 +0000
Subject: merge revision(s) r32583:

	* ChangeLog: fix typo


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 28e5cb6a04..a271e16033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2576,7 +2576,7 @@ Thu Jul 14 12:40:07 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
 	* ext/openssl/ossl.c (ossl_verify_cb): trap the exception from
 	  verify callback of SSLContext and X509Store and make the
 	  verification fail normally. Raising exception directly from callback
-	  causes orphan resouces in OpenSSL stack. Patched by Ippei Obayashi.
+	  causes orphan resources in OpenSSL stack. Patched by Ippei Obayashi.
 	  See #4445.
 
 	* test/openssl/test_ssl.rb
-- 
cgit v1.2.3