Merge branch 'MDL-49963' of https://github.com/andrewhancox/moodle

author David Monllao <davidm@moodle.com>

Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)

committer David Monllao <davidm@moodle.com>

Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)
author David Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)
committer David Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)
diff --cc lang/en/moodle.php
Simple merge
diff --cc user/index.php
Simple merge
author	David Monllao <davidm@moodle.com>
	Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)
committer	David Monllao <davidm@moodle.com>
	Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)
		1	2
lang/en/moodle.php	patch \|	diff1 \|	diff2 \|	blob \| history
user/index.php	patch \|	diff1 \|	diff2 \|	blob \| history