CRM-12539 fix

----------------------------------------
* CRM-12539: "Greater London" should be "London" in list of UK states and provinces
  http://issues.civicrm.org/jira/browse/CRM-12539

CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl

@@ -114,4 +114,7 @@ UPDATE civicrm_navigation
    SET url  = 'civicrm/admin/badgelayout&reset=1',
        name = 'Event Name Badge Layouts',
        label= '{ts escape="sql" skip="true"}Event Name Badge Layouts{/ts}'
- WHERE name = 'Event Badge Formats';
\ No newline at end of file
+ WHERE name = 'Event Badge Formats';
+
+--CRM-12539 change 'Greater London' to 'London'
+UPDATE `civicrm_state_province` SET `name` = 'London' WHERE `name` = 'Greater London';
\ No newline at end of file

xml/templates/civicrm_state_province.tpl

@@ -3696,7 +3696,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (9993, 1226, "BRK", "Berkshire"),
 (9994, 1226, "WMD", "West Midlands"),
 (9998, 1226, "WGM", "West Glamorgan"),
-(9999, 1226, "LON", "Greater London"),
+(9999, 1226, "LON", "London"),
 
 (10000, 1107, "CI", "Carbonia-Iglesias"),
 (10001, 1107, "OT", "Olbia-Tempio"),