Merge branch 'wip-MDL-56271-31' of git://github.com/marinaglancy/moodle into MOODLE_3...
commit23cf2f6db3a3165b7c86e0d25f08860ea45e47c9
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:01:24 +0000 (16 08:01 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:01:24 +0000 (16 08:01 +0000)
tree201a6c6330d1db0bf8582831217fc0e246312a39
parentbdccf17907b14dd8483f9687c7d744b2b048bbc0
parent6608a30b156a00f6abcee5ad104f3d75e8227e0e
Merge branch 'wip-MDL-56271-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE