Merge branch 'MDL-62657-master' of git://github.com/junpataleta/moodle

diff --cc lib/upgrade.txt
index 2877dd0,7a53c41..ba7071a
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -101,8 -89,22 +101,24 @@@ information provided here is intended e
    - file_merge_draft_areas()
    - file_replace_file_area_in_text()
    - extract_draft_file_urls_from_text()
 +* Class coursecat is now alias to autoloaded class core_course_category, course_in_list is an alias to
 +  core_course_list_element, class coursecat_sortable_records is deprecated without replacement.
+ * \core_user_external::create_users() and \core_user_external::update_users() can now accept more user profile fields so user
+   creation/update via web service can now be very similar to the edit profile page's functionality. The new fields that have been
+   added are:
+   - maildisplay
+   - interests
+   - url
+   - icq
+   - skype
+   - aim
+   - yahoo
+   - msn
+   - institution
+   - department
+   - phone1
+   - phone2
+   - address
  
  === 3.5 ===
  

diff --cc user/externallib.php
Simple merge

diff --cc user/tests/externallib_test.php
Simple merge