Merge remote-tracking branch 'origin/stable-3.0.5'
| | |
| | | ('CL', 'CHILE', 'Chile', 'CHL', 152, 'n'), |
| | | ('CN', 'CHINA', 'China', 'CHN', 156, 'n'), |
| | | ('CX', 'CHRISTMAS ISLAND', 'Christmas Island', NULL, NULL, 'n'), |
| | | ('CC', 'COCOS (KEELING, 'n') ISLANDS', 'Cocos (Keeling, 'n') Islands', NULL, NULL, 'n'), |
| | | ('CC', 'COCOS (KEELING) ISLANDS', 'Cocos (Keeling) Islands', NULL, NULL, 'n'), |
| | | ('CO', 'COLOMBIA', 'Colombia', 'COL', 170, 'n'), |
| | | ('KM', 'COMOROS', 'Comoros', 'COM', 174, 'n'), |
| | | ('CG', 'CONGO', 'Congo', 'COG', 178, 'n'), |
| | |
| | | ('ER', 'ERITREA', 'Eritrea', 'ERI', 232, 'n'), |
| | | ('EE', 'ESTONIA', 'Estonia', 'EST', 233, 'y'), |
| | | ('ET', 'ETHIOPIA', 'Ethiopia', 'ETH', 231, 'n'), |
| | | ('FK', 'FALKLAND ISLANDS (MALVINAS, 'n')', 'Falkland Islands (Malvinas, 'n')', 'FLK', 238, 'n'), |
| | | ('FK', 'FALKLAND ISLANDS (MALVINAS)', 'Falkland Islands (Malvinas)', 'FLK', 238, 'n'), |
| | | ('FO', 'FAROE ISLANDS', 'Faroe Islands', 'FRO', 234, 'n'), |
| | | ('FJ', 'FIJI', 'Fiji', 'FJI', 242, 'n'), |
| | | ('FI', 'FINLAND', 'Finland', 'FIN', 246, 'y'), |
| | |
| | | ('GY', 'GUYANA', 'Guyana', 'GUY', 328, 'n'), |
| | | ('HT', 'HAITI', 'Haiti', 'HTI', 332, 'n'), |
| | | ('HM', 'HEARD ISLAND AND MCDONALD ISLANDS', 'Heard Island and Mcdonald Islands', NULL, NULL, 'n'), |
| | | ('VA', 'HOLY SEE (VATICAN CITY STATE, 'n')', 'Holy See (Vatican City State, 'n')', 'VAT', 336, 'n'), |
| | | ('VA', 'HOLY SEE (VATICAN CITY STATE)', 'Holy See (Vatican City State)', 'VAT', 336, 'n'), |
| | | ('HN', 'HONDURAS', 'Honduras', 'HND', 340, 'n'), |
| | | ('HK', 'HONG KONG', 'Hong Kong', 'HKG', 344, 'n'), |
| | | ('HU', 'HUNGARY', 'Hungary', 'HUN', 348, 'y'), |