Merge branch 'MDL-56719-master' of git://github.com/damyon/moodle
commite7bba8ce4da32c21d0e2d4571567dc817cc4e18d
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 11:06:22 +0000 (14 11:06 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 11:06:22 +0000 (14 11:06 +0000)
tree47e73d0e92ea1873cef2d2e0f36d4880cfe4cedc
parentdd24216a3b5407c18e70dfee8648b27a637ec767
parentf619064b9ba73dd6bf3863a457e13a766baf9a84
Merge branch 'MDL-56719-master' of git://github.com/damyon/moodle