* ext/json: Import JSON 1.5.5.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 36130: [Backport #5023]

	* ext/readline/readline.c (Init_readline): don't set 0 to
	  rl_catch_signals and rl_catch_sigwinch. [Bug #5423]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 34982: [Backport #5218]

	* eval_jump.c (rb_exec_end_proc): remember the latest exit status.
	  [ruby-core:43173][Bug #5218]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 32688,33309,33408,33864,35874,38012: [Backport #7832]

	* vm_method.c (rb_gc_mark_unlinked_live_method_entries): remove unused
  variables.
	* vm_insnhelper.c (vm_call_cfunc): suppress a warning.  note that
	  `volatile type *var' doesn't make var itself volatile.

	* vm_insnhelper.c (vm_call_cfunc): remove useless hack.

	* regparse.c (onig_number_of_names): suppress a warning.

	* gc.c : remove a unused function.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
[Backport #7851]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* vm.c (vm_exec): get rid of a SEGV when calling rb_iter_break() from
  some extention libraries.  [Backport #7896] [ruby-core:52607]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39384:

	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
	  new attribute to read/write entity expansion text limit.  the default
	  limit is 10Kb.

	* lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.


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