Merge branch 'wip-MDL-26044' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jan 2011 09:48:08 +0000 (10:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jan 2011 09:48:08 +0000 (10:48 +0100)

Trivial merge