Merge branch 'MDL-29111_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit4984e712e6904b515f330c198faa617aaf274324
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 00:02:55 +0000 (29 02:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 00:02:55 +0000 (29 02:02 +0200)
treec6747253a05a62d292e418120913969674c52a46
parent174245497eeab4052a56bb9ed1ec9772f7464ce9
parent15e62463594580dcf41478e3f99b9068436e8651
Merge branch 'MDL-29111_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE