Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 23:52:32 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 23:52:32 +0000 (01:52 +0200)

Trivial merge