Merge branch 'MDL-45599-master-addons' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 14:31:50 +0000 (15:31 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 14:31:50 +0000 (15:31 +0100)
1  2 
lang/en/admin.php
lang/en/plugin.php

Simple merge
Simple merge