Merge branch '36296-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 16:59:06 +0000 (17:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 17:09:15 +0000 (18:09 +0100)

Trivial merge