Merge branch 'MDL-31721_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit89c8b0a8c0fcb4c8d1309d90bd1e3d1ebc7f9b4d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 21:07:01 +0000 (27 22:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 21:07:01 +0000 (27 22:07 +0100)
tree0c6532a70d75a2ac9ec302518786a1ff521a5d68
parent7c330ad77d8d3483b5f36740197bf3c02cd4d354
parent1b5d149b4361e8e581113f1f2c8269ee4e24a535
Merge branch 'MDL-31721_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE