Merge branch 'wip-MDL-42870-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 03:37:44 +0000 (11:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 03:37:44 +0000 (11:37 +0800)

Trivial merge