Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:38:20 +0000 (11:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:38:20 +0000 (11:38 +0100)

Trivial merge