From e8550ee0329586b32de425e905c7af7e65bc78a8 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 13 May 2009 01:10:37 -0700
Subject: Cherry-pick core extensions

---
 activesupport/lib/active_support/core_ext/object/conversions.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activesupport/lib/active_support/core_ext/object')

diff --git a/activesupport/lib/active_support/core_ext/object/conversions.rb b/activesupport/lib/active_support/core_ext/object/conversions.rb
index 278b856c45..638f0decc1 100644
--- a/activesupport/lib/active_support/core_ext/object/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/object/conversions.rb
@@ -1,3 +1,6 @@
+require 'active_support/core_ext/array/conversions'
+require 'active_support/core_ext/hash/conversions'
+
 class Object
   # Alias of <tt>to_s</tt>.
   def to_param
-- 
cgit v1.2.3