merges r24704 from trunk into ruby_1_9_1.

--
* ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr;
  set and convert its encoding. [ruby-dev:38304]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index 9436d9819..dc0eafa76 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 306
+#define RUBY_PATCHLEVEL 307
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1