Merge branch 'MDL-28655-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE
commit88b340161b071588f4fad4da8e32f9f7fa3c908b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:07:44 +0000 (17 00:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:07:44 +0000 (17 00:07 +0200)
tree85a38b6a6cd12d905d9b1103aeb9b6a46a28c381
parent5b18861bf01c6a836765b686169e807f92921927
parentfe34282df6c7a149824e51ea646fc9a0ecbff4ef
Merge branch 'MDL-28655-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE