Merge branch 'release/0.14' into wdtk

Conflicts:
    app/views/request/show.html.erb

1 files changed, 5 insertions, 6 deletions

diff --git a/app/models/mail_server_log_done.rb b/app/models/mail_server_log_done.rb
index 0e7e9eec3..222b072c5 100644
--- a/app/models/mail_server_log_done.rb
+++ b/app/models/mail_server_log_done.rb
@@ -1,13 +1,12 @@
 # == 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
+#  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