Merge 0.8->trunk
authorWaqas Hussain <waqas20@gmail.com>
Fri, 28 Jan 2011 23:54:08 +0000 (04:54 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Fri, 28 Jan 2011 23:54:08 +0000 (04:54 +0500)
commit1230b2ca32b35e16fbf9d283dfe8f34ab828c9e7
treebdd1dfe8c1990036e76b8cffc9db2dface0458ac
parent7f093845d8a7d72f109db3f092ca240f21d25bd1
parent14e478867b5e673654430ac8d3fe62bbd94a76d1
Merge 0.8->trunk
core/s2smanager.lua