Merge branch 'MDL-36103_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:51:44 +0000 (12:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:51:44 +0000 (12:51 +1300)

Trivial merge