Merge branch 'MDL-36511-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 23:12:30 +0000 (12:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 23:12:30 +0000 (12:12 +1300)

Trivial merge