Merge branch 'mybranch' of git://github.com/orangea/ruby into trunk
Conflicts: ChangeLog
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Added by shyouhei (Shyouhei Urabe) over 15 years ago
Merge branch 'mybranch' of git://github.com/orangea/ruby into trunk
Conflicts:
ChangeLog
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e