Merge branch 'MDL-56070-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 28 Sep 2016 03:20:00 +0000 (11:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 28 Sep 2016 03:20:00 +0000 (11:20 +0800)
1  2 
lang/en/admin.php

Simple merge