Merge branch 'MDL-29625' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2011 10:10:51 +0000 (12:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2011 10:10:51 +0000 (12:10 +0200)
commitf6e1809608d02eb81f6518273a5ae99990d9f240
tree2c3cae84064ba3046cc98f188c5939d025ab5986
parentfc09870e0e86ade039a746cf6c62675b39882c56
parente4e0020ed6b5532e1bafdc55062110c36fd796a4
Merge branch 'MDL-29625' of git://github.com/timhunt/moodle