Merge branch 'MDL-31058_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit6f892151beafdcd96dafbfe671f846b0d55cd048
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:56:42 +0000 (23 00:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:56:42 +0000 (23 00:56 +0100)
tree2f427e67bfbe1a6d2e0f05edae8dc9746fb9d4af
parent158c275618c509e51eff6d4bb189b0c58ac7841e
parentf38065ff421e32b6c1a19b4499b5e14a72f16cc7
Merge branch 'MDL-31058_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE