projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
2d7db68
)
Merge Zash->trunk
author
Matthew Wild
<mwild1@gmail.com>
Fri, 15 Apr 2011 21:45:06 +0000
(22:45 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 15 Apr 2011 21:45:06 +0000
(22:45 +0100)
util/datetime.lua
patch
|
blob
|
history
diff --git
a/util/datetime.lua
b/util/datetime.lua
index 301a49a5e9cd60035d4603919428f6192cd1058c..c73d8e761a3c86db120119f7670082ec487f82be 100644
(file)
--- a/
util/datetime.lua
+++ b/
util/datetime.lua
@@
-49,7
+49,7
@@
function parse(s)
if sign == "-" then tzd_offset = -tzd_offset; end
end
sec = (sec + time_offset) - tzd_offset;
- return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec});
+ return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec
, isdst=false
});
end
end
end