Merge branch 'MDL-56654-master' of git://github.com/damyon/moodle
commit246288c3f91dc04a460acd1391811ba12b4b372f
authorDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:20:14 +0000 (4 14:20 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:20:14 +0000 (4 14:20 +0000)
tree3405cbd3855e4f0b48576087fc3d1d011aae8dda
parent1e1e4ff8e57633bd7c51371a888794d8a087090a
parent5ae35b9dee87e9e2616f04b6ac3de32d291cdb72
Merge branch 'MDL-56654-master' of git://github.com/damyon/moodle