Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 05:01:31 +0000 (13:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 05:01:31 +0000 (13:01 +0800)
commit405666d3718d187041d52424ada812f7fff1f74f
tree912996eac14fc39e866151bdb929424ecf90ecc2
parent0dcbbbaa7eb728f2d98db2158b34dfa2f3405261
parenta6f29f4c63a2bedee1d04f5287d6acdc8effe2f2
Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle