Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:23:55 +0000 (12:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:23:55 +0000 (12:23 +0000)
commit75cb891b5a78826a69792a0f44a2f24a5fdb6749
tree79a55fe3f6bdff03798ce985a503ac8676215a1a
parent42d80f2b9de29df9fe9ad8b736b9fd311e9d6a91
parentb5f661b1119cb18a8a9aaa4e95a6d1c3afbf3f8f
Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle