Merge branch 'MDL-48773_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 07:18:16 +0000 (08:18 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 07:18:16 +0000 (08:18 +0100)
commit0969f0da5ba9c1078df845382eb74caf3aa0f965
tree38f8332374242da1d3a6ccd4b46eb39a7e5b7b20
parent132b75d06722b1401cf8fc77dd0cfcd1f82bccab
parentdddadf53577cdd9d63b9cc6f87537ed23b7a5b54
Merge branch 'MDL-48773_m32v1' of https://github.com/sbourget/moodle