Merge branch 'wip-MDL-31175-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 15:15:02 +0000 (16:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 15:15:02 +0000 (16:15 +0100)

Trivial merge