# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1261085896 0
# Node ID 7926f513816b3c494cc61a030aab9e279f2d386c
# Parent  1c7839fbbe9de43c3468a521022ab7ad4a8cc3f7# Parent  bc1ae371ad544ec61f07a7ef6fd54400d0fd8538
Merge with backout branch

diff -r 1c7839fbbe9d -r 7926f513816b core/s2smanager.lua
--- a/core/s2smanager.lua	Thu Dec 17 21:36:31 2009 +0000
+++ b/core/s2smanager.lua	Thu Dec 17 21:38:16 2009 +0000
@@ -412,7 +412,6 @@
 			end
 		end
 	end
-
 	session.notopen = nil;
 end