Merge branch 'MDL-26236' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:16:33 +0000 (01:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:16:33 +0000 (01:16 +0100)
commitb180a11998073ed08ea2b39061affe2fc0194a3f
tree18fbfe45d955f24c7ad05fb9ed9aaa8c996e8103
parentbcbb59022708b042a4a36501a12ea3897e455384
parentc991ecb49d67eddd0d74be7d009f82b4571f143b
Merge branch 'MDL-26236' of git://github.com/timhunt/moodle