Merge branch 'MDL-54672-master-given-i-enrol' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 21 May 2016 10:26:01 +0000 (12:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 21 May 2016 10:26:01 +0000 (12:26 +0200)

Trivial merge