Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 17:04:25 +0000 (18:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 17:04:25 +0000 (18:04 +0100)
commit4386e0d1019f1b04b13339cc93fd7b9c650c2638
tree374f5be56b5b0fad1f759537d410411128324196
parent1f95c9a4afdb1c6ccbd41b6cc6821b92b59ceb16
parent2c23734a7ff62d8ee3e886699124e5f6b6c0d064
Merge branch 'master' of git.moodle.org:/git/integration