Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 15:58:55 +0000 (17:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 15:58:55 +0000 (17:58 +0200)
commitdd927fcefb076e50d8741e8319a85b2ee25a0a7a
tree5f29845330246c17338e3eae92a82a0db9722a19
parent555ac0298512e30fd4231e6cc1c411a18663ddb0
parent89526681cb3a48894b8182a57731a0865ffaca2f
Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle