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

Trivial merge