Merge branch 'MDL-29570_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitc5c9be022d78820b3e9fce2675cd7f61d1dafb65
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 19:42:55 +0000 (3 21:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 19:42:55 +0000 (3 21:42 +0200)
treedaecf7af5ad3fc0dc33f27bc9f2a4044abd01c4a
parentb056fee5ba8bf8b445f0dee611c5a1191f95eb8a
parent8258ddff3bfa5cd97b87dd56252176ce5b9e7e5a
Merge branch 'MDL-29570_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE