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)
commite1555a7b36d3ea881c893eef34318cf890e7ac02
treed2f7d6eb99c1e43d2a246ee15d1b0f1249c6e8b0
parent303d122ae5014d5d99f742cb07765b6306ea8d05
parentd44e2e42dc08346791c17169d79a4334d1672209
Merge branch 'MDL-56070-master' of git://github.com/jleyva/moodle
lang/en/admin.php