Merge branch 'master' of git.moodle.org:/git/integration
commitc0c232ab63790399f6ae071dbcaeb7b367bb28d5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 15:31:27 +0000 (21 16:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 15:31:27 +0000 (21 16:31 +0100)
tree89d33f970d795b6868afdff29cdf591bb5959c91
parent7a5852c857f2099f100c7c4dba88207ec1d4ea91
parent10464ffb3339dec23c10d711944d8ca74f1e68eb
Merge branch 'master' of git.moodle.org:/git/integration