Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:51:51 +0000 (16:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:51:51 +0000 (16:51 +0800)
1  2 
lang/en/admin.php

Simple merge