Merge branch 'MDL-49280-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 14:03:59 +0000 (15:03 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 14:03:59 +0000 (15:03 +0100)
commitcfeadc66b0a64f5b13b8bf6e6f9f46c37ab8b3c9
tree280904d1a9da167aac43783f4ffb630aed23f599
parentc7d17be4172af44b0bab21e60ae4795a3ea9095d
parentbc9837241f0d04200fad70bcbaa1471bb9b03ca7
Merge branch 'MDL-49280-m' of https://github.com/micaherne/moodle
lang/en/auth.php