Merge branch 'release/0.8' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/contact_mailer/from_admin_message.rhtml

1 files changed, 1 insertions, 1 deletions

diff --git a/script/runner b/script/runner
index 2bd5e9aa7..1575848de 100755
--- a/script/runner
+++ b/script/runner
@@ -31,7 +31,7 @@ Dir.chdir(alaveteli_dir) do
                 fh.puts pid
             end
         end
-        
+
         Process.detach(pid)
     else
         # Not daemon mode