Merge branch 'MDL-35211_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 22:02:33 +0000 (11:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 22:02:33 +0000 (11:02 +1300)

Trivial merge