merge revision(s) 33603: [Backport #5533] [Backport #5911]

	* file.c (file_expand_path): reset coderange after expanding path.


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

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f72ba209a..a854034c26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  6 20:38:19 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): reset coderange after expanding path.
+
 Mon Feb  6 20:32:17 2012  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* ext/date/date_strptime.c: moved detector of leftover.
diff --git a/version.h b/version.h
index 192962c601..19c3dec251 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 38
+#define RUBY_PATCHLEVEL 39
 
 #define RUBY_RELEASE_DATE "2012-02-06"
 #define RUBY_RELEASE_YEAR 2012