Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 02:07:10 +0000 (10:07 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 02:07:10 +0000 (10:07 +0800)
1  2 
lang/en/admin.php

Simple merge