Merge branch 'MDL-48438' of https://github.com/andrewhancox/moodle
commitb8e0dcbb7e6f14c30717ed52f89e78cccab90d81
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Oct 2015 23:12:17 +0000 (7 01:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Oct 2015 23:12:17 +0000 (7 01:12 +0200)
tree1439057dace4d39c33f9e3178568c58e6c1c80fb
parentcb171682ff7361c6131009d2916c32e2d8db20e5
parent81295fc40ec0af9fa4ccfebc858ab8f6d1326023
Merge branch 'MDL-48438' of https://github.com/andrewhancox/moodle
lang/en/moodle.php