merges r23918 and r23919 from trunk into ruby_1_9_1.

--
* marshal.c (w_encoding): encodings need extra depth.
  [ruby-core:24100]
--
* test/ruby/test_marshal.rb (TestMarshal#test_limit): test for
  [ruby-core:24100].

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

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index c159da4f36..a92b159bb6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-07-12"
-#define RUBY_PATCHLEVEL 213
+#define RUBY_PATCHLEVEL 214
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1