Merge branch 'MDL-42977-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:52:42 +0000 (08:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:52:42 +0000 (08:52 +0800)
commit5084343b3fc47333c8092b4d2aee8bcec113a91b
treebb126fbf2c4907a25094a01c6e987a4e5c268dc3
parenta4abacc9a69f33a9b7a2fa6e71fe95ad7e6fbdbf
parentaf28ceb94572584ec6809cc33f3f9c5a4d2995fb
Merge branch 'MDL-42977-master' of git://github.com/lameze/moodle