Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 19:55:20 +0000 (20:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 19:55:20 +0000 (20:55 +0100)
commit4c2ce98b42fc4975ba93f844da5e93beeace7b21
tree009bc1aade9abe6c09854300dc1d177bb285562c
parent83ee4693c5cae75a36b8475692386bc94fac4bf6
parentc20d07074ced7339708c91ab87f4430c776c7612
Merge branch 'master' of git.moodle.org:/git/integration