Merge branch 'MDL-31101_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commita33fc27467361fe11e86ad6c8ef9b31b54206c8d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2012 22:35:26 +0000 (10 23:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2012 22:35:26 +0000 (10 23:35 +0100)
tree57c8ecc26098c5dbf9db676c4d4abccd1272111e
parent91dac2a2c97df8b777ce3c3810406b5212ea2df7
parent675d9968850371445d7070e0dfe44d2eb65fe830
Merge branch 'MDL-31101_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE