Merge branch 'MDL-29511_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitc3a4009a56e7196151c26144ba8942a7a010f60b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 23:11:48 +0000 (4 01:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 23:11:48 +0000 (4 01:11 +0200)
tree214450f7f4d76d5fa21cb6edfc0eff075f6dcd4d
parentf0837f65d868a3d1cf70fa88750dbf0c6c8ada78
parentb99d21aaa9b1795ae9f9e2882afddb9af9c8a18d
Merge branch 'MDL-29511_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE