Merge branch 'MDL-56242-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 06:07:36 +0000 (14:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 06:07:36 +0000 (14:07 +0800)
commit8f3a295c6eb8b2554eb368768c3e2c347185ef9b
tree36a9339be90228196f0e27bc4681f6493c0e77f0
parent9444636cb8db339c20c1c06936372154777f7fbd
parentf2405a5f5c57245d77996b933ff8d60ec5b09561
Merge branch 'MDL-56242-master' of git://github.com/damyon/moodle