Merge branch 'wip-MDL-34669-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle...
authorDan Poltawski <dan@moodle.com>
Tue, 7 Aug 2012 00:48:38 +0000 (08:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Aug 2012 00:48:38 +0000 (08:48 +0800)

Trivial merge