merge revision(s) 39475: [Backport #7868]

	* ext/date/date_core.c: [ruby-core:52303]


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

	* parse.y (parser_magic_comment): should pass the proper value.
	  [ruby-dev:44984][Bug #5753]


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

	* string.c (rb_str_concat): set array element after definition
	  to fix compile error with Fujitsu C Compiler 5.6 on Solaris 10
	  on Sparc.  [Bug #5878] [ruby-dev:45123]


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

	* lib/ipaddr.rb (IPAddr#in6_addr): Fix the parser so that it can
	  recognize IPv6 addresses with only one edge 16-bit piece
	  compressed, like [::2:3:4:5:6:7:8] or [1:2:3:4:5:6:7::].
	  [Bug #7477]

	* lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing
	  parenthesis.


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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merge remote-tracking branch 'upstream/ruby_1_9_3' into ruby_1_9_3
Merge remote-tracking branch 'github/ruby_1_9_3' into cbits_1_9_3
Merge remote-tracking branch 'github/cbits_1_9_3' into cbits_1_9_3-osx-relative