# HG changeset patch
# User Jittat Fakcharoenphol <jittat@gmail.com>
# Date 2010-01-28 02:55:56
# Node ID 1925d77bb0c3d587e9ec20224b499072abeed75d
# Parent  9e664dd718889dcc0adcea5dee55170ccd383922
# Parent  c28a214e4637117e53888d035f4fd65a2675e8b5

Merge branch 'master' into codejom (bug fix)

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -21,7 +21,7 @@
   def login
     saved_notice = flash[:notice]
     reset_session
-    flash[:notice] = saved_notice
+    flash.now[:notice] = saved_notice
 
     # EXPERIMENT:
     # Hide login if in single user mode and the url does not