[ruby-cvs:61229] nagachika:r54068 (ruby_2_2): merge revision(s) 53609: [Backport #12011]

[nagachika at ruby-lang.org]

nagachika	2016-03-09 22:58:39 +0900 (Wed, 09 Mar 2016)

  New Revision: 54068

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

  Log:
    merge revision(s) 53609: [Backport #12011]
    
    * marshal.c (r_object0): honor Marshal.load post proc
      value for TYPE_LINK.  by Hiroshi Nakamura <nahi at ruby-lang.org>
      https://github.com/ruby/ruby/pull/1204 fix GH-1204

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/marshal.c
    branches/ruby_2_2/test/ruby/test_marshal.rb
    branches/ruby_2_2/version.h