Merge branch 'master' of git.moodle.org:/git/integration
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Nov 2011 23:59:59 +0000 (00:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Nov 2011 23:59:59 +0000 (00:59 +0100)
commit2afaf485cf5341b8f17fd049a38f06d6c00691c3
tree0dcacba97fbb02d01f96743325720ae4618971b5
parent0620787a17e06db937ca7880afcd8a1fea47cddd
parentd905b69e95d675e032f4f93ce6afe1f86cb254c2
Merge branch 'master' of git.moodle.org:/git/integration