Merge branch 'MDL-56355-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Oct 2016 01:47:43 +0000 (09:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Oct 2016 01:47:43 +0000 (09:47 +0800)
commitc071a83c9449fa9ef32cadbb728e11fa82ddd0f8
tree1e6b261d9c963d1f59e3fea6759a71001aadbdfa
parent8cf4139074a288296cfe30e41653957a3d3f2fa7
parent65be5b6c1148970b3d911932fde931b613dc9129
Merge branch 'MDL-56355-master' of git://github.com/ryanwyllie/moodle