Merge remote-tracking branch 'origin/release/0.6.8' into wdtk

Conflicts:
  config/general.yml-example

1 files changed, 23 insertions, 0 deletions

diff --git a/app/models/mail_server_log_done.rb b/app/models/mail_server_log_done.rb
new file mode 100644
index 000000000..3fb20f0b3
--- /dev/null
+++ b/app/models/mail_server_log_done.rb
@@ -0,0 +1,23 @@
+# == Schema Information
+# Schema version: 20121010214348
+#
+# Table name: mail_server_log_dones
+#
+#  id         :integer         not null, primary key
+#  filename   :text            not null
+#  last_stat  :datetime        not null
+#  created_at :datetime        not null
+#  updated_at :datetime        not null
+#
+
+# Stores that a particular mail server log file has been loaded in, see mail_server_log.rb
+#
+# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
+# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
+
+class MailServerLogDone < ActiveRecord::Base
+    has_many :mail_server_logs
+end
+
+
+