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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-02 13:46:46 +00:00
parent 484a6ffb78
commit 3da0a0cead
4 changed files with 66 additions and 4 deletions

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-02-01"
#define RUBY_PATCHLEVEL 14
#define RUBY_RELEASE_DATE "2014-02-02"
#define RUBY_PATCHLEVEL 15
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 1
#define RUBY_RELEASE_DAY 2
#include "ruby/version.h"