Merge branch 'MDL-50442-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:21:31 +0000 (18:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:21:31 +0000 (18:21 +0200)

Trivial merge