Merge branch '43365-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:35:17 +0000 (01:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:35:17 +0000 (01:35 +0200)

Trivial merge