Merge branch 'MDL-59255-master' of github.com:lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 09:54:05 +0000 (10:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 09:54:05 +0000 (10:54 +0100)
commitfaa52511c394504322cabec64365d576edd74961
tree406a8bd2df93b1c509cf216b686138ca4c91953e
parentf14987bc2407f7856b292cb19bb57659f47c5cc7
parent362be64a2bb9b5c2b733fb0891a1ae3f310e6430
Merge branch 'MDL-59255-master' of github.com:lucisgit/moodle