Merge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Apr 2016 12:24:59 +0000 (14:24 +0200)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:17:52 +0000 (12:17 +0100)

Trivial merge