From 696a3164c3c82754339777bccc05b0cb6f4aa153 Mon Sep 17 00:00:00 2001 From: ovclas Date: Wed, 16 May 2012 09:48:38 +0000 Subject: [PATCH] reverse merge from 1.6.0 (r10054) git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10700 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/func.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/func.inc.php b/config/func.inc.php index 19c0cd544..fc69b8952 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -66,9 +66,9 @@ '+0600' => '[GMT +06:00] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time', '+0630' => '[GMT +06:30] Cocos Islands Time, Myanmar Time', '+0700' => '[GMT +07:00] Indochina Time, Krasnoyarsk Standard Time', - '+0800' => '[GMT +08:00] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time', + '+0800' => '[GMT +08:00] China Standard Time, Australian Western Standard Time, Irkutsk Standard Time', '+0845' => '[GMT +08:45] Southeastern Western Australia Standard Time', - '+0900' => '[GMT +09:00] Korea Standard Time, Japan Standard Time, China Standard Time', + '+0900' => '[GMT +09:00] Korea Standard Time, Japan Standard Time', '+0930' => '[GMT +09:30] Australian Central Standard Time', '+1000' => '[GMT +10:00] Australian Eastern Standard Time, Vladivostok Standard Time', '+1030' => '[GMT +10:30] Lord Howe Standard Time',