Merge branch 'MDL-52284-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Dec 2015 15:16:20 +0000 (16:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Dec 2015 15:16:20 +0000 (16:16 +0100)

Trivial merge