Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 05:08:33 +0000 (13:08 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 05:08:33 +0000 (13:08 +0800)

Trivial merge