Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:45:46 +0000 (10:45 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:45:46 +0000 (10:45 +0800)

Trivial merge