Merge branch 'master' of git.moodle.org:/git/integration
commit395181f9bb2813fe4f133237f003de2b78ae7b3d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:18 +0000 (18 18:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:18 +0000 (18 18:25 +0100)
tree12f20b7eb9de2419460653663cd68b6bfce4f404
parentf5c452a3b342be92fd39aee6d56d44e4e2c82ec8
parented3eb9ea749ff7a1a7a9773b4975f05a65ed5a8a
Merge branch 'master' of git.moodle.org:/git/integration