Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Nov 2015 08:46:43 +0000 (08:46 +0000)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2015 16:56:21 +0000 (17:56 +0100)

Trivial merge