Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 06:57:49 +0000 (14:57 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 06:57:49 +0000 (14:57 +0800)
commitae9da6a22263e9c825b1a3070ca4486b256569b1
treece94defff833c474a8b268e07587ace26463bf02
parent2c69d24037089c060b1937425aa4c1d676a2b5d3
parent56fb39316ff1ea703c2e3bde5a3c4719c9ff8056
Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle