Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)
diff --cc lib/amd/build/form-autocomplete.min.js

index 9e44334,dedccb7..fb06114

Binary files differ
diff --cc lib/amd/src/form-autocomplete.js
Simple merge
diff --cc lib/upgrade.txt
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 12 Apr 2016 19:34:41 +0000 (21:34 +0200)
		1	2
lib/amd/build/form-autocomplete.min.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/amd/src/form-autocomplete.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/upgrade.txt	patch \|	diff1 \|	diff2 \|	blob \| history