moodle-mergeuser - adding type of user id introduced in the form, to help administrators selecting users.
Merge branch 'update-when-existing'
moodle-mergeusers - journal_entries is processed like grade_grades and groups_members.
Merge pull request #7 from jpahullo/urvmaster

Urvmaster
Better handling of finding users to merge

* When searching on idnumber, multiple user records can be returned. So using MUST_EXIST parameter for Moodle database API. This also ensures that a user record exists. Removed now unnecessary error handling and related strings.
* Handling if trying to merge the same user accounts.
* Fixed debugging messages that appear in Moodle 2.5, because setType wasn't being called on the correct form field. Also, changed type from PARAM_INT to PARAM_USERNAME.
* Replaced now deprecated call to get system context.
* Updated lang strings for new error string and removed error strings no longer referenced.
Fixed typo for english lang string 'dbok'
Fixed type error in sql statement
moodle/tool_mergeusers: detectd a new compound index on table course_completions
Merge pull request #12 from jpahullo/course_completions

Course completions
Merge pull request #8 from rlorenzo/patch-better-user-handling

Better handling of finding users to merge
Merge pull request #10 from rlorenzo/master

Fixed typo for english lang string 'dbok'
Merge pull request #11 from RoyalKnight/master

Fixed type error in sql statement
moodle-mergeusers - journal_entries is processed like grade_grades and groups_members.
Better handling of finding users to merge

* When searching on idnumber, multiple user records can be returned. So using MUST_EXIST parameter for Moodle database API. This also ensures that a user record exists. Removed now unnecessary error handling and related strings.
* Handling if trying to merge the same user accounts.
* Fixed debugging messages that appear in Moodle 2.5, because setType wasn't being called on the correct form field. Also, changed type from PARAM_INT to PARAM_USERNAME.
* Replaced now deprecated call to get system context.
* Updated lang strings for new error string and removed error strings no longer referenced.
Fixed type error in sql statement
moodle/tool_mergeusers: detectd a new compound index on table course_completions
Merge branch 'master' of github.com:ndunand/moodle-mergeusers