Merge branch '42302-26' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 22:39:46 +0000 (00:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 22:39:46 +0000 (00:39 +0200)

Trivial merge