Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 15 Apr 2015 05:35:37 +0000 (13:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 15 Apr 2015 05:35:37 +0000 (13:35 +0800)
1  2 
lang/en/admin.php

Simple merge