Merge branch 'MDL-28202_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit0518140c31294913ebfdafa73eef2966dfcbf13e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 20:28:47 +0000 (26 22:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 20:28:47 +0000 (26 22:28 +0200)
treec71e9928dd8af066735c73ed04c9154150913046
parent4d7a9cd8f59e2da6f270110e47db46422d2c3885
parent18d81bdb3c45b8cbe0a33f81ace28c4a3d0f8e54
Merge branch 'MDL-28202_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE