1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 019d4a14f0..7d5a15ff5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Jul 17 08:07:31 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* backport r32563 from trunk
+
+	* test/openssl/test_ssl_session.rb: add PEM SSL session without TLS
+	  extensions. Use this as the default for the tests to ensure
+	  compatibility with OpenSSL 0.9.7.
+	  [ Ruby 1.9 - Bug #4961 ] [ruby-core:37726]
+
 Sat Jul 16 17:29:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_UNIVERSAL_ARCH): restore arch flag.