Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 00:45:37 +0000 (01:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 00:45:37 +0000 (01:45 +0100)

Trivial merge