Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 05:29:18 +0000 (13:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 05:29:18 +0000 (13:29 +0800)
commitde374c3df13a42ece65e69f56871aafe547d7ef9
tree893234ef630d551cc6cf4ebfba27c8b630806bdf
parent42f7b608ed399ec502fee9118c9ad8f684d8742b
parent848d212e7ac0eea81cd66486248b0e6af28e52d3
Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle