Merge branch 'wip-MDL-48978-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Jan 2015 10:52:45 +0000 (11:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Jan 2015 10:58:50 +0000 (11:58 +0100)

Trivial merge