Merge branch 'MDL-57791_master-fix3' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 10:37:54 +0000 (11:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 10:37:54 +0000 (11:37 +0100)
commit35699ba2ff2809ca9ad63397c132a94518e712a6
tree579beb22fdc470b3d73e134b21c4c72aa4546a42
parent7de5101d4ea8c98a42ac8b03dacf9cbf71e18993
parent85e50ba405746fdbaa8b0d793942efdc35329f72
Merge branch 'MDL-57791_master-fix3' of git://github.com/dmonllao/moodle