Merge branch 'wip-MDL-31160-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:53:16 +0000 (00:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:53:16 +0000 (00:53 +0100)

Trivial merge