Merge branch 'MDL-56573-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:03:00 +0000 (12:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:03:00 +0000 (12:03 +0800)
commitc86fb2178991e2387e0e33b34bb96d76da145b5e
tree4f3d7d81057b574f929ce7c2e1caed37eb6f8ad6
parent09a05b798be1213a7b0c1a5464d308d7f5cd4890
parent59eb63612bcd35fddc40045f3b11b9afc2f04b8b
Merge branch 'MDL-56573-master' of git://github.com/junpataleta/moodle