Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:17:40 +0000 (10:17 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:17:40 +0000 (10:17 +0800)

Trivial merge