Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Dec 2010 16:02:02 +0000 (17:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Dec 2010 16:02:02 +0000 (17:02 +0100)

Trivial merge