Merge branch 'MDL-36107b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 02:07:00 +0000 (15:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 02:07:00 +0000 (15:07 +1300)

Trivial merge