Merge branch 'wip-MDL-36075_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle...
authorDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 06:57:24 +0000 (14:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 06:57:24 +0000 (14:57 +0800)

Trivial merge