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)
commit2904f664215bb683c034abfef2073e20ac641f2f
tree27fff941fe14603b33a4a53b7c9d43d28567c19b
parentc111ef97180a5b3b651215295ef3a9ebaa5be4b4
parent5b7c500a71855dde4307be7c5367bad74c703008
Merge branch 'MDL-49963' of https://github.com/andrewhancox/moodle
lang/en/moodle.php
user/index.php