Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle

author Andrew Nicols <andrew@nicols.co.uk>

Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)

committer Andrew Nicols <andrew@nicols.co.uk>

Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)
diff --cc admin/auth_config.php
Simple merge
diff --cc lang/en/moodle.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
diff --cc lib/myprofilelib.php
Simple merge
diff --cc user/editlib.php
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)
		1	2
admin/auth_config.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/moodle.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/myprofilelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
user/editlib.php	patch \|	diff1 \|	diff2 \|	blob \| history