Merge branch 'wip-MDL-26507' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 10:17:16 +0000 (11:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 10:17:16 +0000 (11:17 +0100)

Trivial merge