Merge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 11:20:11 +0000 (12:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 11:20:11 +0000 (12:20 +0100)
commit8ea6cc2455446c6e3c4bc5c64f289a3a90cb848c
tree6a68870be10cae42987af4fa5902935c6a03786c
parentbf3b8a35d86567813749cf7567b9af9ca4ca5d56
parent07d4777816ae980a32587efc0dd5cd3d0f81f4cd
Merge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle