Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Nov 2011 23:59:59 +0000 (00:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Nov 2011 23:59:59 +0000 (00:59 +0100)

Trivial merge