Merge branch 'MDL-56943-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 02:54:09 +0000 (10:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 02:54:09 +0000 (10:54 +0800)
commit896718ef79c158e970b8ff16593112b14e612200
tree8cc805a7d21da4b15e500ede7eb1f83fb0928aaa
parentdfe7cbe4cf1709042c4d1f5483e75bc9e8402ab6
parenta4e2d645715f64ab71ee0bdfc68d4cafb26e1151
Merge branch 'MDL-56943-master' of git://github.com/danpoltawski/moodle