Merge branch 'wip-MDL-36453-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle...
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:32:05 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:32:05 +0000 (14:32 +0800)

Trivial merge