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

Conflicts:
  config/general.yml-example

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 0e547d493..2e98e1021 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -151,7 +151,7 @@ class OutgoingMessage < ActiveRecord::Base
                 raise "Message id #{self.id} has type '#{self.message_type}' which validate can't handle"
             end
         end
-        if self.body =~ /#{get_signoff}\s*\Z/ms
+        if self.body =~ /#{get_signoff}\s*\Z/m
             errors.add(:body, _("Please sign at the bottom with your name, or alter the \"%{signoff}\" signature" % { :signoff => get_signoff }))
         end
         if !MySociety::Validate.uses_mixed_capitals(self.body)