Merge pull request #2701 from riking/email-pr-ssl

Rename POP3 settings, fix multisite SSL state leak

db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb

@@ -0,0 +1,9 @@
+class RenameSettingsPop3sToPop3 < ActiveRecord::Migration
+  def up
+    execute "UPDATE site_settings SET name = replace(name, 'pop3s', 'pop3') WHERE name ILIKE 'pop3%'"
+  end
+
+  def down
+    execute "UPDATE site_settings SET name = replace(name, 'pop3', 'pop3s') WHERE name ILIKE 'pop3%'"
+  end
+end