Merge branch 'MDL-49963' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)
1  2 
lang/en/moodle.php
user/index.php

Simple merge
diff --cc user/index.php
Simple merge