Merge branch '44209-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:30:43 +0000 (01:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:30:43 +0000 (01:30 +0100)

Trivial merge