Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 19:50:09 +0000 (21:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 19:50:09 +0000 (21:50 +0200)

Trivial merge