Merge branch '45231-27-3' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 13:50:15 +0000 (15:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 May 2014 13:50:15 +0000 (15:50 +0200)

Trivial merge