Merge branch '37680-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Jan 2015 23:40:00 +0000 (00:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Jan 2015 23:40:00 +0000 (00:40 +0100)

Trivial merge