Merge branch 'MDL-52702-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 14:37:17 +0000 (14:37 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 14:37:17 +0000 (14:37 +0000)
commitb42adaab449672ee20822ba53ca44fbb7069b46c
tree62becf072f783b7c5e44d1cc99c8d2b4e6bac30a
parent7fba3b03168489c86fc5af7ce2d0a20aea5a4615
parent5e43eea080228c86370fb19ae4e767497243d5e4
Merge branch 'MDL-52702-m' of https://github.com/micaherne/moodle
lang/en/admin.php