Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 22:48:47 +0000 (11:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 22:48:47 +0000 (11:48 +1300)

Trivial merge