Merge branch 'MDL-57084_master' of git://github.com/markn86/moodle
commit0dcbbbaa7eb728f2d98db2158b34dfa2f3405261
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 04:26:20 +0000 (5 12:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 04:26:20 +0000 (5 12:26 +0800)
tree109ca6ac6153b50e12be684762979beb55d5636f
parentfeda939e2fa57821a2bdcbc6584d962835954ec1
parent57b3433604dd58f12fe73975bf65f2a0be7b1a6b
Merge branch 'MDL-57084_master' of git://github.com/markn86/moodle