Merge branch 'MDL-26618' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 15:46:46 +0000 (17:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 15:46:46 +0000 (17:46 +0200)
commit555ac0298512e30fd4231e6cc1c411a18663ddb0
tree28d043b08547477b7ae1296fc729662dd4228bf3
parentee992c6c666eedb7783f800a8a0c672e1c205e1e
parentfd3932fe5429a87703e292184ed39a5e7b90bbda
Merge branch 'MDL-26618' of git://github.com/timhunt/moodle