Merge branch 'rails'

Conflicts:
	actionmailer/lib/action_mailer.rb
	actionmailer/lib/action_mailer/delivery_method/smtp.rb

1 files changed, 36 insertions, 34 deletions

diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index f6e011a5ab..67e086d8bd 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,38 +1,40 @@
 module ActionView #:nodoc:
-  class TextTemplate < String #:nodoc:
-    HTML = Mime[:html]
-
-    def initialize(string, content_type = HTML)
-      super(string.to_s)
-      @content_type = Mime[content_type] || content_type
-    end
-
-    def details
-      {:formats => [@content_type.to_sym]}
-    end
-
-    def identifier
-      self
-    end
-
-    def inspect
-      'text template'
-    end
-
-    def render(*args)
-      to_s
-    end
-
-    def mime_type
-      @content_type
-    end
-
-    def formats
-      [mime_type]
-    end
-
-    def partial?
-      false
+  class Template
+    class Text < String #:nodoc:
+      HTML = Mime[:html]
+
+      def initialize(string, content_type = HTML)
+        super(string.to_s)
+        @content_type = Mime[content_type] || content_type
+      end
+
+      def details
+        {:formats => [@content_type.to_sym]}
+      end
+
+      def identifier
+        self
+      end
+
+      def inspect
+        'text template'
+      end
+
+      def render(*args)
+        to_s
+      end
+
+      def mime_type
+        @content_type
+      end
+
+      def formats
+        [mime_type]
+      end
+
+      def partial?
+        false
+      end
     end
   end
 end