Merge branch 'MDL-36336_MOODLE_23_STABLE' of git://github.com/moodlerooms/moodle...
authorSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:47:53 +0000 (11:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:47:53 +0000 (11:47 +1300)

Trivial merge