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)
1  2 
lang/en/auth.php

Simple merge