Merge branch 'MDL-52388-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Mar 2016 21:14:06 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Mar 2016 21:14:06 +0000 (23:14 +0200)

Trivial merge