Merge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:10:44 +0000 (12:10 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:10:44 +0000 (12:10 +0000)
commit42d80f2b9de29df9fe9ad8b736b9fd311e9d6a91
tree340f0e387b6b1c70cd11ee40044e9aeb60aa0b04
parenta04ad3675aa4ac39582e6b087ad323600fea002d
parent726adbc22a02bd0032bd1bc02fbcf7fc8b015a79
Merge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle