[ruby-cvs:61408] nagachika:r54247 (ruby_2_2): merge revision(s) 54139: [Backport #12185]

[nagachika at ruby-lang.org]

nagachika	2016-03-24 20:52:00 +0900 (Thu, 24 Mar 2016)

  New Revision: 54247

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

  Log:
    merge revision(s) 54139: [Backport #12185]
    
    * ext/socket/option.c (inspect_tcpi_msec): more accurate condition
      for TCPI msec member inspection function.
      [ruby-core:74388] [Bug #12185]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/socket/option.c
    branches/ruby_2_2/version.h