Merge branch 'm23_MDL-34755' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 03:02:26 +0000 (15:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 03:02:26 +0000 (15:02 +1200)

Trivial merge