Merge branch 'MDL-44707-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Oct 2015 03:35:29 +0000 (11:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:32 +0000 (16:31 +0100)
commit2dcbd2a27d5d7a81800067ee8533d110d6b9688e
treee5f382c8dea6d83f0f3ad770f22f83408c76c1e0
parent05e6215c489495600a2db4e57e57f9096c367582
parentf5b93846af4cc78ddc6749dd6877302465074fad
Merge branch 'MDL-44707-master' of git://github.com/marinaglancy/moodle