Merge branch '48335-29' of git://github.com/samhemelryk/moodle

diff --cc lang/en/auth.php
Simple merge

diff --cc lang/en/backup.php
Simple merge

diff --cc lang/en/mnet.php
Simple merge

diff --cc lang/en/moodle.php
Simple merge