From 4e0e8dad05383f2eb210e246c8f2676f158be2cf Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 21 Jun 2011 10:59:24 -0700
Subject: merge from ruby trunk

---
 lib/psych/deprecated.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/psych/deprecated.rb b/lib/psych/deprecated.rb
index f4034e3..333c3a1 100644
--- a/lib/psych/deprecated.rb
+++ b/lib/psych/deprecated.rb
@@ -76,6 +76,7 @@ module Psych
 end
 
 class Object
+  undef :to_yaml_properties rescue nil
   def to_yaml_properties # :nodoc:
     instance_variables
   end
-- 
cgit v1.2.3