Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 00:51:44 +0000 (01:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 00:51:44 +0000 (01:51 +0100)

Trivial merge