[Pkg-owncloud-commits] [php-sabre-vobject] 41/128: Thanks @staabm. It was late.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 4e606a18b60d97c9b4717ce0a9618e3a6f67101c
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Jan 22 12:37:25 2014 -0500

    Thanks @staabm. It was late.
---
 lib/Sabre/VObject/timezonedata/lotuszones.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Sabre/VObject/timezonedata/lotuszones.php b/lib/Sabre/VObject/timezonedata/lotuszones.php
index 996eb45..a9dd10f 100644
--- a/lib/Sabre/VObject/timezonedata/lotuszones.php
+++ b/lib/Sabre/VObject/timezonedata/lotuszones.php
@@ -16,7 +16,7 @@ return array(
     'Pacific Standard Time'  => 'America/Los_Angeles',
     'Mexico Standard Time 2' => 'America/Chihuahua',
     'Mountain'               => 'America/Denver',
-    'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
+    // 'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
     'US Mountain'            => 'America/Phoenix',
     'Canada Central'         => 'America/Edmonton',
     'Central America'        => 'America/Guatemala',
@@ -37,7 +37,7 @@ return array(
     'Greenland'              => 'America/Godthab',
     'Montevideo'             => 'America/Montevideo',
     'SA Eastern'             => 'America/Belem',
-    'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
+    // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
     'Azores'                 => 'Atlantic/Azores',
     'Cape Verde'             => 'Atlantic/Cape_Verde',
     'Greenwich'              => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git