Merge branch '44104-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 00:46:47 +0000 (01:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 00:46:47 +0000 (01:46 +0100)

Trivial merge