Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 12 Nov 2013 03:34:39 +0000 (11:34 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 12 Nov 2013 03:34:39 +0000 (11:34 +0800)
1  2 
lang/en/admin.php

Simple merge