Merge branch 'MDL-32245_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 20:51:30 +0000 (09:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 20:51:30 +0000 (09:51 +1300)

Trivial merge