Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:18 +0000 (18:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:18 +0000 (18:25 +0100)

Trivial merge