Merge branch 'MDL-59237-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 11:15:52 +0000 (12:15 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 11:15:52 +0000 (12:15 +0100)
commit4364fdb53755f8ebb9247e92ff36e9e61e261a09
tree773f356fc655d4f4060b62aaf583a974a233102a
parentb4e55d3a37fdc795d0c4947c0c817533c90185d2
parent9f1ab2db6dcbc7f62c81b7a9d11293d69782948a
Merge branch 'MDL-59237-master' of git://github.com/jleyva/moodle