Merge branch 'MDL-28653_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit25bde46869f68bf9204c154ff439cadd03bda97c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:25:46 +0000 (17 00:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:25:46 +0000 (17 00:25 +0200)
tree4610e81326d2961fa926751ee03b7251c3bdd4a4
parent269c6535607f72a8dc9aa1cc55c8fe7ef0cbbe8c
parentdc4bff71a21182799ff2556d8a92ec883a7e34db
Merge branch 'MDL-28653_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE