Merge branch 'wip-MDL-35542-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle...
authorDan Poltawski <dan@moodle.com>
Mon, 24 Sep 2012 06:37:49 +0000 (14:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Sep 2012 06:37:49 +0000 (14:37 +0800)

Trivial merge