# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1346112745 -18000
# Node ID 022123451e526af8da8207051bab2bcbcd35dda9
# Parent  ab338242e0da23c9c3b216a352323a92c06fd304# Parent  6ac790efecd369f611a5c7cb79f19b5fc6a9f985
Merge 0.9->trunk

diff -r ab338242e0da -r 022123451e52 util/datetime.lua
--- a/util/datetime.lua	Sun Aug 26 23:57:12 2012 +0100
+++ b/util/datetime.lua	Tue Aug 28 05:12:25 2012 +0500
@@ -36,7 +36,7 @@
 function parse(s)
 	if s then
 		local year, month, day, hour, min, sec, tzd;
-		year, month, day, hour, min, sec, tzd = s:match("^(%d%d%d%d)-?(%d%d)-?(%d%d)T(%d%d):(%d%d):(%d%d)%.?%d*([Z+%-].*)$");
+		year, month, day, hour, min, sec, tzd = s:match("^(%d%d%d%d)%-?(%d%d)%-?(%d%d)T(%d%d):(%d%d):(%d%d)%.?%d*([Z+%-]?.*)$");
 		if year then
 			local time_offset = os_difftime(os_time(os_date("*t")), os_time(os_date("!*t"))); -- to deal with local timezone
 			local tzd_offset = 0;