Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 01:59:42 +0000 (09:59 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 01:59:42 +0000 (09:59 +0800)

Trivial merge