Merge with trunk

Sat, 27 Nov 2010 21:53:10 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Sat, 27 Nov 2010 21:53:10 +0000
changeset 3660
d50bf9f55ff9
parent 3656
aa7bf12a5668 (diff)
parent 3659
13600f0d56b5 (current diff)
child 3661
f8879cee87a2

Merge with trunk

--- a/core/storagemanager.lua	Sun Nov 28 02:42:02 2010 +0500
+++ b/core/storagemanager.lua	Sat Nov 27 21:53:10 2010 +0000
@@ -1,5 +1,5 @@
 
-local error = error;
+local error, type = error, type;
 local setmetatable = setmetatable;
 
 local config = require "core.configmanager";

mercurial