Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 22:25:34 +0000 (23:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 22:25:34 +0000 (23:25 +0100)

Trivial merge