Merge branch 'MDL-58593-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 09:03:07 +0000 (10:03 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 09:03:07 +0000 (10:03 +0100)
commit6e45cfc0c00c903ed67439158d927568f5d4a18d
treeaba8bd95719389fb00e0ed58fc49e203ea0382b6
parent0c290ad191a8c0bcfbf5a012d97998840395fc80
parentcd729dc905f845a61e648d0e07fde6596ab7d2c6
Merge branch 'MDL-58593-master' of git://github.com/merrill-oakland/moodle