Merge branch 'wip-MDL-30222-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:39:25 +0000 (00:39 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:39:25 +0000 (00:39 +0100)

Trivial merge