Changeset

4252:210639fb8fbe

Merge Zash->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 15 Apr 2011 22:45:06 +0100
parents 4250:7b456af75c77 (diff) 4251:96e9d5f9ab3b (current diff)
children 4255:0c525524f2dc
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/util/datetime.lua	Fri Apr 15 00:54:10 2011 +0200
+++ b/util/datetime.lua	Fri Apr 15 22:45:06 2011 +0100
@@ -49,7 +49,7 @@
 				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