Merge branch 'MDL-57206-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 04:21:25 +0000 (12:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 04:21:25 +0000 (12:21 +0800)
commit995c6d2787c87082d23669d482cb3b325bfbdde0
treea4310ffe2138623502cad9e8c3736791ee68189b
parentbb8b3ba6f8abb9f4190a2f3bea2a9322dbb03784
parentbb316e076482345df01e3514663bd3c65e0c2235
Merge branch 'MDL-57206-master' of https://github.com/snake/moodle