Merge branch '48335-29' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 14:28:19 +0000 (14:28 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:33:27 +0000 (11:33 +0000)
1  2 
lang/en/auth.php
lang/en/backup.php
lang/en/mnet.php
lang/en/moodle.php

Simple merge
Simple merge
Simple merge
Simple merge