* NEWS (Mutex#owned?): no longer experimental.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool/change_maker.rb (#diff2index): check Encoding::BINARY.
  BASERUBY may still be 1.8.x.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/thread.rb (Queue#push): return self.
* lib/thread.rb (Queue#clear): ditto.
* lib/thread.rb (SizedQueue#push): ditto.
* test/thread/test_queue.rb: add tests for the above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ChangeLog reformatting and append ticket number.

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

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

* test/ruby/test_file_exhaustive.rb (test_expand_path_home_dir_string):
  add assertions for other user's home directory path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
mkmf.rb: defer use of instance variable

* lib/mkmf.rb (MakeMakefile#dir_config, MakeMakefile#_libdir_basename):
  defer use of instance variable until needed.  [Bug #8074]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.
  fix lookbehind assertion fails with /m mode enabled. [Bug #8023]
  fix \Z matches where it shouldn't. [Bug #8001]

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

* tool/gen_dummy_probes.rb: remove empty lines and compact.

* tool/gen_dummy_probes.rb: allow arbitrary number of arguments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* io.c (extract_binmode): raise error even if binmode and textmode
  don't conflict. [Bug #5918] [ruby-core:42199]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/ruby/envutil.rb (EnvUtil.with_default_external): add for
  changing Encoding.default_external without warnings.

* test/ruby/envutil.rb (EnvUtil.with_default_internal): ditto.

* test/ruby/test_io_m17n.rb: use above with_default_external.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* enumerator.c (enumerator_with_index): try to convert given offset to
  integer. fix bug introduced in r39594.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/mkmf/base.rb: class name conflict.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/mkmf/test_config.rb (TestMkmf): fix superclass mismatch.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
  argument only if non-nil value is given.
  [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
  mrkn.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/net/smtp.rb:  Added Net::SMTP#rset method to implement the SMTP
  RSET command.  [ruby-trunk - Feature #5373]
* NEWS:  ditto.
* test/net/smtp/test_smtp.rb:  Test for the above.


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

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