Merge branch 'MDL-35547_23' of git://github.com/enovation/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:15:30 +0000 (10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:15:30 +0000 (10:15 +1300)

Trivial merge