Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)
commit3648d7963a8b8ae120e855674b82b298678baeac
tree76a370d685ad387f966c3b21bd539a955b4dd2e8
parent09d62af419f7916d2eb60ac90d8bcbbb23363c21
parent70fb46c87f92e5232db484428aa6491ffc6a6cb8
Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle
admin/auth_config.php
lang/en/moodle.php
lib/moodlelib.php
lib/myprofilelib.php
user/editlib.php