Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle
commitf95c00e5514552d857b2c47512848a9aefe9d667
authorDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:31:00 +0000 (4 14:31 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:31:00 +0000 (4 14:31 +0000)
tree0ce0c1e057e4c70f08bb04b03c4f6d2b18f58dbe
parentb7b5b35cf50f145a6257dba11e204e6d7333cc6f
parent6e1e29955440dc1f1101cf227eca258d5ff90327
Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle