Merge branch 'MDL-56566' of https://github.com/bostelm/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 09:20:05 +0000 (09:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 09:20:05 +0000 (09:20 +0000)
commit444017ca7e3a689b3fc60fd2aeb78be4d337ff70
tree2ff9ddc4ce6d68544d4c406b5de66c0ddd072192
parentdc81fdeb3e5cc2b633956b6ee227dc00738904e3
parent5c4bd8f4e8d3c22a810fa5ba10718f50f0cf7bb0
Merge branch 'MDL-56566' of https://github.com/bostelm/moodle