Merge branch '44156-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:53:22 +0000 (00:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:53:22 +0000 (00:53 +0100)

Trivial merge