[ruby-cvs:66404] usa:r59226 (ruby_2_3): merge revision(s) 58825, 58826: [Backport #5339]

[usa at ruby-lang.org]

usa	2017-06-30 20:24:41 +0900 (Fri, 30 Jun 2017)

  New Revision: 59226

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

  Log:
    merge revision(s) 58825,58826: [Backport #5339]
    
    erb.rb: Allow explicit trimming carriage return
    
    when trim_mode is "-", for Windows environments.
    
    [ruby-core:39625] [Bug #5339]
    erb.rb: Allow trimming CR in all trim_modes
    
    to unify a behavior with r58823 and r58825.

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