Merge branch 'MDL-37378_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:42:36 +0000 (10:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:42:36 +0000 (10:42 +1300)

Trivial merge