Merge branch 'MDL-36652' of https://github.com/rushi963/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 21:01:44 +0000 (22:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 21:01:44 +0000 (22:01 +0100)

Trivial merge