Merge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 23:10:03 +0000 (01:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 23:10:03 +0000 (01:10 +0200)
commit7eaca449326d97328aceb9af757b6ae87e72ef35
treed08ba53b92990082fc19620fabe0bbceb7901173
parentcec6a15b996fb7a3ee45805f7606523db356cc65
parent6598f57e90dc6fc0aeb367e6b9615bd9eecb23da
Merge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle