merge revision(s) 27688:

	* lib/net/imap.rb: backported exception handling from trunk.
	  [ruby-core:29745]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f537887fea..60be46242e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  8 16:51:48 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: backported exception handling from trunk.
+	  [ruby-core:29745]
+
 Tue Jun  8 16:42:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (VpAlloc): ensure buf does not get