[ruby-cvs:63038] usa:r55873 (ruby_2_2): merge revision(s) 55579: [Backport #12556]

[usa at ruby-lang.org]

usa	2016-08-12 11:43:36 +0900 (Fri, 12 Aug 2016)

  New Revision: 55873

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

  Log:
    merge revision(s) 55579: [Backport #12556]
    
    * lib/net/ftp.rb (putline): raise an ArgumentError when
      CR or LF is included in a line.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/net/ftp.rb
    branches/ruby_2_2/test/net/ftp/test_ftp.rb
    branches/ruby_2_2/version.h