Merge branch 'wip-mdl-42282' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 03:31:32 +0000 (11:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 03:31:32 +0000 (11:31 +0800)

Trivial merge