Merge branch 'wip-MDL-47337-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 10:05:12 +0000 (11:05 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 10:05:12 +0000 (11:05 +0100)

Trivial merge