Merge branch 'MDL-57957' of https://github.com/bostelm/moodle
commita5906ac9446c6501b7e6f2a410d641314510bb4d
authorDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 02:41:46 +0000 (22 10:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 02:41:46 +0000 (22 10:41 +0800)
tree0a16a811e2774cf8054ed61443a1e86d3781d5ba
parent590292d48ea32a07c3d165a4d04e40881930abff
parentb2e76ba7d8420cdf0b790680690d647c6485694e
Merge branch 'MDL-57957' of https://github.com/bostelm/moodle