* man/ruby.1 (options): include --*-encoding from r38784


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2013-01-12

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/win32ole/win32ole.c (ole_set_byref): support VT_UI8|VT_BYREF,
  VT_I8|VT_BYREF in cygwin and mingw.
	  
* ext/win32ole/win32ole.c (ole_variant2val): ditto.

* test/win32ole/test_win32ole_variant.rb (test_s_new_with_i8_byref):
  ditto.

* test/win32ole/test_win32ole_variant.rb (test_s_new_with_ui8_byref):
  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/psych/lib/psych/visitors/to_ruby.rb: merge key values that
  contain something besides a hash should be left in tact.

* test/psych/test_merge_keys.rb: test for change

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove trailing spaces.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* bootstraptest/runner.rb (exec_test): break lines if not tty.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
setup.mak: -runtime-

* win32/setup.mak (-runtime-): see msvcrt from link header on mswin
  instead of running testing executable file, for cross compiling.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* numeric.c (do_coerce): fix for the exceptions which the coerce
  method raises.  The optimization done by r38756 is preserved.
  [Bug #7645] [ruby-core:51213]

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