Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jun 2016 22:03:45 +0000 (00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jun 2016 22:03:45 +0000 (00:03 +0200)

Trivial merge