Update CPK to 4.1.2 and drop monkey patch

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 5221ab22a6fb4e2c08c8cd87a2954dbcf38addbe..e6181072bcb46e12390997d1767907c106fb8c1b 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -3,6 +3,7 @@ ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
+  :enable_starttls_auto => false
 }
 
 # Monkey patch to allow sending of messages in specific locales