Merge branch 'MDL-25837_wip' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 03:35:06 +0000 (11:35 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 03:35:06 +0000 (11:35 +0800)
commitbec662a0f603aceb43682874a51edd05c9600930
treea9b5759d5a73cf048612676a37685e76629a6ae6
parent227d6da5d870895beadc70a52a19dd7969ef8982
parent85b8f8dfd057007813a48fa1d5b4560501c82142
Merge branch 'MDL-25837_wip' of git://github.com/skodak/moodle