Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:12:50 +0000 (16:12 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:12:50 +0000 (16:12 +0800)
commit1cc0c36e0417a05fab99d887c5b90a77c54bd57f
tree7e0ff015c5cf1c7d30795855796a4b5513becaf5
parent03364f9e2f3eb5c0b5336c82adde5b9d1acc8d15
parent94b8fa5aad92be9f2db56278d22a606bf74ce295
Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle