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)
1  2 
admin/auth_config.php
lang/en/moodle.php
lib/moodlelib.php
lib/myprofilelib.php
user/editlib.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge