Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:26:17 +0000 (16:26 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:26:17 +0000 (16:26 +0800)
commit0017173f1ad98c25780408e5022ac7dc92cf380b
treec395b03f9c230e33bb3ee68adde2831104a4adfa
parent1cc0c36e0417a05fab99d887c5b90a77c54bd57f
parent926814896641b1fc0294f4b7b4a047e84329f884
Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle