Merge branch 'MDL-23813_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit8162a1308a6665fdaaaa83abd356258915406c98
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2012 21:54:02 +0000 (2 23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2012 21:54:02 +0000 (2 23:54 +0200)
tree57741a3b19a6271adcb209721b0d40238e8ac417
parent33406a758cea7131f825726d6929a1b66d8577af
parent9eb220716856803eeb04943bb2256ae83b6016ae
Merge branch 'MDL-23813_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE