Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 08:59:06 +0000 (16:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 08:59:06 +0000 (16:59 +0800)
commite8cd446ecd05fc8ff2e456fafceb8434929ca0d1
tree83dd7c60b66927c0c9eb9b4220fe65e673752f73
parent47e863bb73bf640d139e94513c8276a06ce54b38
parent586cf92909cbc1deb9216cdd53598a5401661572
Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle
lang/en/admin.php
lib/moodlelib.php