Merge branch 'w06_MDL-26262_20_onlineblock' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 08:31:38 +0000 (16:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 08:31:38 +0000 (16:31 +0800)

Trivial merge