Merge branch 'w50_MDL-30623_m23_guest' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 00:49:39 +0000 (13:49 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 00:49:39 +0000 (13:49 +1300)

Trivial merge