[ruby-cvs:53300] usa:r46154 (ruby_2_0_0): merge revision(s) 45534: [Backport #9709]

[usa at ruby-lang.org]

usa	2014-05-27 11:48:46 +0900 (Tue, 27 May 2014)

  New Revision: 46154

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

  Log:
    merge revision(s) 45534: [Backport #9709]
    
    * string.c (str_buf_cat): should round up the capacity by 4KiB,
      but not number of rooms.  [ruby-core:61886] [Bug #9709]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/string.c
    branches/ruby_2_0_0/test/ruby/test_string.rb
    branches/ruby_2_0_0/version.h