Merge branch 'MDL-28996_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit1b69c111cc9b0fd5c42c88b2c169500e5bc6206b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 08:42:52 +0000 (23 10:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 08:42:52 +0000 (23 10:42 +0200)
tree8421b309edb4b645169af1d892fab8667c86b662
parent23eccfcd77c62909192114a072a2f64832593e07
parentda45306da58f535f54c30a6e6f58b32ea35d632c
Merge branch 'MDL-28996_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE