Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 22 Nov 2009 04:50:42 +0000 (04:50 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 22 Nov 2009 04:50:42 +0000 (04:50 +0000)
commit4e9ad86f42f78e32d5a983b62277a0552c853a9c
treebdaa91278226dd634886ab556df1d00b9eb3ca43
parenta55acc03d762191a5d2808e82c7aa16dae57fb8c
parent50f9771ef121b29203acf85e7253cd5b0a63d3c1
Merge with trunk
core/s2smanager.lua