Merge branch 'wip-MDL-30378-m22' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 02:18:02 +0000 (03:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 02:18:02 +0000 (03:18 +0100)

Trivial merge