Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle
commit13a1e8b50c2e0eeeeeae605160d71d1e45242126
authorDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 07:13:58 +0000 (22 15:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 07:13:58 +0000 (22 15:13 +0800)
treea14a03e4b34d5788595cbcf5498ca482de6fb267
parentda2959fe9cdcb6a0a026e3ca09bc7b5eb95e039b
parent2e241fea56181b2a33b5de9bb689abd808eeb047
Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle