Merge branch 'release/0.14'0.14

Conflicts:
    locale/bg/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/it/app.po
    locale/nb_NO/app.po
    locale/pl/app.po
    locale/sv/app.po
    locale/vi/app.po

1 files changed, 5 insertions, 6 deletions

diff --git a/app/models/mail_server_log.rb b/app/models/mail_server_log.rb
index 7f61377ce..0e5b60ff1 100644
--- a/app/models/mail_server_log.rb
+++ b/app/models/mail_server_log.rb
@@ -1,15 +1,14 @@
 # == Schema Information
-# Schema version: 20121010214348
 #
 # Table name: mail_server_logs
 #
-#  id                      :integer         not null, primary key
+#  id                      :integer          not null, primary key
 #  mail_server_log_done_id :integer
 #  info_request_id         :integer
-#  order                   :integer         not null
-#  line                    :text            not null
-#  created_at              :datetime        not null
-#  updated_at              :datetime        not null
+#  order                   :integer          not null
+#  line                    :text             not null
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
 #
 
 # We load log file lines for requests in here, for display in the admin interface.