Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Mar 2015 18:01:10 +0000 (20:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Mar 2015 18:01:10 +0000 (20:01 +0200)

Trivial merge