merges r24015 from trunk into ruby_1_9_1.

--
* marshal.c (r_object0): set encoding only if the encoding is not US-ASCII.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-07-13 08:08:02 +00:00
parent 2d6fb10a9c
commit 39c9f447f8
3 changed files with 8 additions and 2 deletions

View file

@ -4,7 +4,7 @@
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
#define RUBY_PATCHLEVEL 228
#define RUBY_PATCHLEVEL 229
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 12