Merge branch 'MDL-60456-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 Oct 2017 02:27:20 +0000 (10:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 Oct 2017 02:27:20 +0000 (10:27 +0800)
commitd9b6f810ea3cb061483c949941bf7edc1f3116a8
tree31ab4b89ca5aca8fb3a0c870b15bb7160a5d99c4
parent202221f934a02b333a84cfa6e790d093bed56882
parentecb9c82b063a5bc2f61d2ca0bc42bc6744d13a71
Merge branch 'MDL-60456-master' of git://github.com/damyon/moodle