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