merges r30475 from trunk into ruby_1_9_2.

--
* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
  should not be included in JSON mapping

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-01-16 12:34:53 +00:00
parent e94bc25729
commit d97f1d3b37
4 changed files with 11 additions and 2 deletions

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 146
#define RUBY_PATCHLEVEL 147
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1