Merge branch 'MDL-53115-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 01:32:57 +0000 (03:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 01:32:57 +0000 (03:32 +0200)

Trivial merge