Merge branch 'MDL-50142_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:19:13 +0000 (12:19 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:19:13 +0000 (12:19 +0100)
1  2 
lang/en/moodle.php

Simple merge