[ruby-cvs:57424] nagachika:r50276 (ruby_2_2): merge revision(s) 49797: [Backport #10923]

[nagachika at ruby-lang.org]

nagachika	2015-04-13 00:46:26 +0900 (Mon, 13 Apr 2015)

  New Revision: 50276

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

  Log:
    merge revision(s) 49797: [Backport #10923]
    
    * ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX
      Thanks to Yura Sokolov <funny.falcon at gmail.com>
      [ruby-core:68369] [Bug#10923]
    
    * test/io/wait/test_io_wait.rb (test_nread_buffered):
      fix broken test

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/io/wait/wait.c
    branches/ruby_2_2/test/io/wait/test_io_wait.rb
    branches/ruby_2_2/version.h