Merge branch 'master' of gitproxy:rails/rails

rails · Mar 17, 2010 · 7872fa9 · 7872fa9
2 parents a6dc227 + 644219a
commit 7872fa9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -1,4 +1,5 @@
-require "erb"
+require 'erb'
+require 'active_support/core_ext/object/singleton_class'
 
 class ERB
   module Util