merge revision(s) 39169:
	  release manager finally decided to revert it.

	* eval.c (rb_ensure): preserve errinfo across ensure proc before


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39179,39245: [Backport #7826]

	the process maybe already finished
	* test/ruby/test_process.rb (test_setsid): Added a workaround for
	  MacOS X. Patch by nagachika. [Bug #7826] [ruby-core:52126]


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

	add doc. for IO#close_on_exec=.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39214,39221: [Backport #7830]

	configure.in: Werror-implicit-function-declaration

	* configure.in (warnflags): -Werror-implicit-function-declaration
  haven't been used as-is, but always replaced with -Werror= or -W.
	* configure.in (warnflags): disable -Werror by default unless
	  development.  [ruby-core:52131] [Bug #7830]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39234,39235: [Backport #7843]

	* vm_method.c: call method_removed hook on called class, not on
	  prepending iclass.
	  prepending iclass.  [ruby-core:52207] [Bug #7843]


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

	* class.c (include_modules_at): detect cyclic prepend with original
	  method table.  [ruby-core:52205] [Bug #7841]


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

	win32.c: style

	* win32/win32.c (rb_w32_fd_is_text): adjust style.


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

	* test/ruby/test_thread.rb: fixed typo
	  patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248


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

	* vm.c (ENV_IN_HEAP_P): fix off-by-one error.


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

	* .gdbinit (iseq): rename dummy_gdb_enums to ruby_dummy_gdb_enums.
  This is follow up to changes in r24407.

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

	* tool/mkconfig.rb: remove prefix from rubyarchdir.
	  r39267 expands variables, it changes expansion timing,
	  breaks RbConfig::CONFIG["includedir"] and building
	  extension libraries with installed ruby.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39286,39287:

	* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
	  [Github tenderlove/psych#118]
	  [Github tenderlove/psych#127]


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

	* configure.in: remove debug print.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39309,39310: [Backport #7551]

	* ext/openssl/ossl.c (class OpenSSL):  Fixed ExtensionFactory example.
	  Patch by Richard Bradley.  [ruby-trunk - Bug #7551]

	* ext/openssl/ossl.c (class OpenSSL):  Use only inner parenthesis in
	  create_extension examples.


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

	* ChangeLog: fix a typo.


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

	* array.c: Fix typo in class documentation

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

	enumerator.c: suppress warnings

	* enumerator.c (lazy_zip_arrays_func, lazy_zip_func, lazy_take_func),
  (lazy_drop_func, lazy_drop_while_func): suppress uninitialized
  instance vriable warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39349,39374: [Backport #7886]

	* file.c (rb_group_member): get rid of NGROUPS dependency.
	  [Bug #7886] [ruby-core:52537]


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

	* tool/merger.rb: add interaction when only ChangeLog is modified.


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

	mkconfig.rb: clear exec_prefix

	* tool/mkconfig.rb: clear exec_prefix which may differ from prefix,
  before expanding rubyarchdir to remove prefix.

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