6402 Update zoneinfo to 2015g
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by:

*** 1,15 ****
  # ISO 3166 alpha-2 country codes
  #
  # This file is in the public domain, so clarified as of
  # 2009-05-17 by Arthur David Olson.
  #
! # From Paul Eggert (2014-07-18):
  # This file contains a table of two-letter country codes.  Columns are
  # separated by a single tab.  Lines beginning with '#' are comments.
! # Although all text currently uses ASCII encoding, this is planned to
! # change to UTF-8 soon.  The columns of the table are as follows:
  #
  # 1.  ISO 3166-1 alpha-2 country code, current as of
  #     ISO 3166-1 Newsletter VI-16 (2013-07-11).  See: Updates on ISO 3166
  #   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
  # 2.  The usual English name for the coded region,
--- 1,14 ----
  # ISO 3166 alpha-2 country codes
  #
  # This file is in the public domain, so clarified as of
  # 2009-05-17 by Arthur David Olson.
  #
! # From Paul Eggert (2015-05-02):
  # This file contains a table of two-letter country codes.  Columns are
  # separated by a single tab.  Lines beginning with '#' are comments.
! # All text uses UTF-8 encoding.  The columns of the table are as follows:
  #
  # 1.  ISO 3166-1 alpha-2 country code, current as of
  #     ISO 3166-1 Newsletter VI-16 (2013-07-11).  See: Updates on ISO 3166
  #   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
  # 2.  The usual English name for the coded region,
*** 36,46 ****
  AR      Argentina
  AS      Samoa (American)
  AT      Austria
  AU      Australia
  AW      Aruba
! AX      Aaland Islands
  AZ      Azerbaijan
  BA      Bosnia & Herzegovina
  BB      Barbados
  BD      Bangladesh
  BE      Belgium
--- 35,45 ----
  AR      Argentina
  AS      Samoa (American)
  AT      Austria
  AU      Australia
  AW      Aruba
! AX      Åland Islands
  AZ      Azerbaijan
  BA      Bosnia & Herzegovina
  BB      Barbados
  BD      Bangladesh
  BE      Belgium
*** 65,75 ****
  CC      Cocos (Keeling) Islands
  CD      Congo (Dem. Rep.)
  CF      Central African Rep.
  CG      Congo (Rep.)
  CH      Switzerland
! CI      Cote d'Ivoire
  CK      Cook Islands
  CL      Chile
  CM      Cameroon
  CN      China
  CO      Colombia
--- 64,74 ----
  CC      Cocos (Keeling) Islands
  CD      Congo (Dem. Rep.)
  CF      Central African Rep.
  CG      Congo (Rep.)
  CH      Switzerland
! CI      Côte d'Ivoire
  CK      Cook Islands
  CL      Chile
  CM      Cameroon
  CN      China
  CO      Colombia
*** 209,219 ****
  PS      Palestine
  PT      Portugal
  PW      Palau
  PY      Paraguay
  QA      Qatar
! RE      Reunion
  RO      Romania
  RS      Serbia
  RU      Russia
  RW      Rwanda
  SA      Saudi Arabia
--- 208,218 ----
  PS      Palestine
  PT      Portugal
  PW      Palau
  PY      Paraguay
  QA      Qatar
! RE      Réunion
  RO      Romania
  RS      Serbia
  RU      Russia
  RW      Rwanda
  SA      Saudi Arabia