Merge branch 'MDL-54921-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 07:13:47 +0000 (15:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 07:13:47 +0000 (15:13 +0800)
commit8e9cb9b1dd79a6aa6f4a2e9ae5b1400b2aff525c
tree44cf8625131cdd832ea18d243e8c4615b6c1b168
parent405666d3718d187041d52424ada812f7fff1f74f
parent59b9c4d47a530e18c917994b0a083b037f5d5524
Merge branch 'MDL-54921-master' of https://github.com/xow/moodle