Merge branch 'MDL-29548' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:31:34 +0000 (12:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:31:34 +0000 (12:31 +0200)
commit66f7705daaf31c562cb9a4f7fe01d79248b367b4
tree0e19115359d44ffbc3fa5ba979cd6c7ad0396af1
parentcdee9bd4f61f3de794db67360f902bd80ee1dac2
parent7529f9e94421ad5572a7023aca6609aa353b76b4
Merge branch 'MDL-29548' of git://github.com/timhunt/moodle