Merge branch 'MDL-29462_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitdc110687c8b8cae9aaa85d25ffca0f23cec23247
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 20:42:09 +0000 (26 22:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 20:42:09 +0000 (26 22:42 +0200)
treeeb22cf55869686e0a1078888151aa533aa35b1eb
parent0518140c31294913ebfdafa73eef2966dfcbf13e
parent4e92a71fb35240c05cf7cbd3c0fd246040bdf47f
Merge branch 'MDL-29462_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE