Merge branch '45457-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 21:54:36 +0000 (23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 21:54:36 +0000 (23:54 +0200)

Trivial merge