Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)
commit66861ab603cd79b41f9320d020b165ac5681d226
treebfe409a86f1c597ec600d6226384c7c5c5714598
parent8d8f658967504064cdcc74936ae4f61ada8ba857
parent943cebcac0b831c56a72a041140a68ec36b7f2b9
Merge 0.9->trunk
core/storagemanager.lua
plugins/mod_admin_telnet.lua
plugins/mod_storage_internal.lua
plugins/mod_storage_sql.lua