Merge branch 'MDL-56051-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:45:01 +0000 (11:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:45:01 +0000 (11:45 +0800)
commit3b7772370117435b089c5a53881d8fe81a7f1259
treee0331e5176d52f213a7834da1967673547d7f570
parent5473943cac2451eab71e6c4afcd5af2bbdbf1f90
parenteacf30e61fac5f0484e3c179b1b41e2284ab9918
Merge branch 'MDL-56051-master' of git://github.com/damyon/moodle