Merge branch 'wip-MDL-29006-m21' of git://github.com/samhemelryk/moodle into MOODLE_2...
commitabaff947c609ece5e9e1be6a85a87cab7def5959
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2011 22:38:38 +0000 (6 00:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2011 22:38:38 +0000 (6 00:38 +0200)
tree79031c5046a1c3a7da67fcc3c25fb42de0457180
parentae115cf22959cc27802b0a9a9d3b8736a8825417
parente9a574454c32cf79bfc8c5b0c006a3ccb3c174b6
Merge branch 'wip-MDL-29006-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE