Merge branch 'MDL-37068_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:39:52 +0000 (13:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:39:52 +0000 (13:39 +1300)

Trivial merge