Merge branch 'm28_MDL-46625' of https://github.com/totara/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Aug 2014 11:04:11 +0000 (13:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Aug 2014 11:04:11 +0000 (13:04 +0200)

Trivial merge