MDL-9315 fixed incorrect use of localtion (should be city) in user profile; merged from MOODLE_18_STABLE together with other changes by Nic
MDL-9315 fixed incorrect use of localtion (should be city) in user profile; merged from MOODLE_18_STABLE together with other changes by Nic

dilawar/moodle