Merge branch 'wip-MDL-35276-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle...
authorDan Poltawski <dan@moodle.com>
Wed, 26 Sep 2012 07:21:36 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Sep 2012 07:21:36 +0000 (15:21 +0800)

Trivial merge