Merge branch 'w04_MDL-31173_m23_restore' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 08:06:47 +0000 (16:06 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 08:06:47 +0000 (16:06 +0800)

Trivial merge