Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 11:19:35 +0000 (13:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 11:19:35 +0000 (13:19 +0200)

Trivial merge