Merge branch 'wip-MDL-30770-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:26:03 +0000 (02:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:26:03 +0000 (02:26 +0100)
commitc557dbdbfe2447f5a5be23bf447044617b394ba4
tree705dac2eeeb0cc2d412f5533416ea410f14ab567
parent2dee0aaf2ec57ea9023e6f0fa29f8ce98791f4d5
parent6be4afb1ad593cec5ebe6ff124c1ebc67d5f3357
Merge branch 'wip-MDL-30770-m23' of git://github.com/samhemelryk/moodle