Merge branch 'MDL-56677_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Nov 2016 06:56:32 +0000 (14:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Nov 2016 06:56:32 +0000 (14:56 +0800)
commiteff0a3e97ff9c8b0ba260207284b425620fd812e
treee59b01011d7004a6ea5015a69b8bc6d64bbcb487
parent34ef8fa13affdd2158962062225d3ca42eda56fa
parent18bb2883ce3c5a3b2f462b81e92f095f2b864322
Merge branch 'MDL-56677_master-fix' of git://github.com/dmonllao/moodle