Merge branch '35597-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:39:00 +0000 (16:39 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:39:00 +0000 (16:39 +0100)

Trivial merge