[ruby-cvs:56891] naruse:r49741 (ruby_2_2): merge revision(s) 49740:

[naruse at ruby-lang.org]

naruse	2015-02-25 15:36:54 +0900 (Wed, 25 Feb 2015)

  New Revision: 49741

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

  Log:
    merge revision(s) 49740:
    
    * tool/merger.rb: support 2.1+ versioning scheme.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/tool/mkconfig.rb
    branches/ruby_2_2/version.h