Merge branch 'MDL-50136-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 May 2015 17:34:00 +0000 (19:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 May 2015 17:34:00 +0000 (19:34 +0200)

Trivial merge