Merge with 0.9
authorMatthew Wild <mwild1@gmail.com>
Thu, 26 Jan 2012 18:48:21 +0000 (18:48 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 26 Jan 2012 18:48:21 +0000 (18:48 +0000)
commit8f05e6d80fd64a095fe9bc7dc9825149c269439b
tree84681fb070def0c8b4d4971376d03bbfda871c3e
parent42a6d2d9001c53ac8aa3a6ad4a38a09053dec40a
parent0ac54afb4d11ffc9ec6906e9fe86caf63ab714a8
Merge with 0.9
core/s2smanager.lua