Merge branch 'wip-MDL-42288-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Oct 2013 03:53:26 +0000 (11:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Oct 2013 03:53:26 +0000 (11:53 +0800)

Trivial merge