[ruby-cvs:66478] nagachika:r59300 (ruby_2_4): merge revision(s) 58823: [Backport #11464]

[nagachika at ruby-lang.org]

nagachika	2017-07-10 05:04:25 +0900 (Mon, 10 Jul 2017)

  New Revision: 59300

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

  Log:
    merge revision(s) 58823: [Backport #11464]
    
    erb.rb: Allow trimming carriage return
    
    when trim_mode is "<>", for Windows environments.
    
    [Bug #11464]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/lib/erb.rb
    branches/ruby_2_4/test/erb/test_erb.rb
    branches/ruby_2_4/version.h