Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:20:34 +0000 (12:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:20:34 +0000 (12:20 +0000)
commit241473ce2eaa731f1b922d1def2a4d73125a85d3
tree536096809b1a986f19dd120f1ba23ad86a344af9
parent589449b81eec516a92249e3a437317a827d51379
parent63c2ea50383cf6b3c2ff0359cf770abeb3c976a5
Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle