Merge branch 'w52_MDL-30809_m23_guestinstance' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jan 2012 00:05:22 +0000 (13:05 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jan 2012 00:05:22 +0000 (13:05 +1300)

Trivial merge