Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 22:32:10 +0000 (00:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 22:32:10 +0000 (00:32 +0200)

Trivial merge