Merge branch 'wip-MDL-35661-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle...
authorDan Poltawski <dan@moodle.com>
Mon, 15 Oct 2012 05:31:22 +0000 (13:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Oct 2012 05:31:22 +0000 (13:31 +0800)

Trivial merge