Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Dec 2010 16:02:02 +0000 (17:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Dec 2010 16:02:02 +0000 (17:02 +0100)
commit958c04e450295f164990b5b9eda000e4fa358e3f
treed2305259d7fb4bde4df6b32527d7f1c6211ba85a
parentcc26cb3b3372467650187a226f3cdc03aaaade12
parent800bd78548b06f3ae9b1e18e74655e6c9006f97a
Merge branch 'master' of git.moodle.org:/git/integration