Merge branch 'MDL-57613-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 16:17:09 +0000 (16:17 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 16:17:09 +0000 (16:17 +0000)
commitafcb080014468ecdf52c3e5b50657c2c28947075
tree04291143591ed584ca92b0a99d9631aa3ba4d967
parent7043676ec35a8f620f87d274a25523543f74a9d3
parentab887f8de9c878810c2782d66522a0a531d70054
Merge branch 'MDL-57613-master' of https://github.com/xow/moodle