[ruby-cvs:51939] naruse:r44794 (ruby_2_1): merge revision(s) 44630, 44631: [Backport #9403]

[naruse at ruby-lang.org]

naruse	2014-02-02 22:46:46 +0900 (Sun, 02 Feb 2014)

  New Revision: 44794

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44794

  Log:
    merge revision(s) 44630,44631: [Backport #9403]
    
    * lib/delegate.rb (Delegator): keep source information methods
      which start and end with '__'.  [ruby-core:58572] [Bug #9155]
      which start and end with '__'.  [ruby-core:59718] [Bug #9403]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/delegate.rb
    branches/ruby_2_1/test/test_delegate.rb
    branches/ruby_2_1/version.h