Merge branch 'MDL-51292-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 15:32:57 +0000 (17:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 15:32:57 +0000 (17:32 +0200)

Trivial merge