Merge branch 'MDL-50589-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:53:08 +0000 (16:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:53:08 +0000 (16:53 +0100)

Trivial merge