Merge branch 'MDL-46322' of https://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Jun 2017 08:15:55 +0000 (09:15 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:32:01 +0000 (12:32 +0100)
commitf1ec088e84b074e9ef672456263e1abb99d31aff
treeaea96204c799ccc41cd3508904c7abddf3ea2621
parent63aa8c27be3f7e72f73002295bd19a8369f8566f
parent84e3c97bb05a9e21147859d880d2333300b2f1da
Merge branch 'MDL-46322' of https://github.com/stronk7/moodle