Mercurial > lxmppd-hg-xmllex / changeset

• changeset
• raw
• zip
• gz

changeset

Merge with backout branch

Thu, 17 Dec 2009 21:38:16 +0000

author

Matthew Wild <mwild1@gmail.com>

date

Thu, 17 Dec 2009 21:38:16 +0000

changeset 2381

7926f513816b

parent 2380

1c7839fbbe9d (current diff)

parent 2378

bc1ae371ad54 (diff)

child 2382

5e37e28a429f

Merge with backout branch

--- 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