Merge branch 'wip-MDL-36335-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 22:43:29 +0000 (11:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 22:43:29 +0000 (11:43 +1300)

Trivial merge