Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Oct 2011 22:49:25 +0000 (11:49 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Oct 2011 22:49:25 +0000 (11:49 +1300)

Trivial merge