Merge branch 'wip-MDL-57568-master' of git://github.com/abgreeve/moodle
commit746372776104c548dc67602c52cb24053985265a
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Jan 2017 05:56:16 +0000 (30 13:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Jan 2017 05:56:16 +0000 (30 13:56 +0800)
treeac2748edbb7b384f42554c71f126f1ace58bce49
parente7059ec5e2f6f39fd405a1e8406643cdf38bf7db
parent5ad0bb82f177aed7f2fb909d5a0c6c5b078f36c9
Merge branch 'wip-MDL-57568-master' of git://github.com/abgreeve/moodle