Merge branch 'MDL-60125-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 03:49:30 +0000 (11:49 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 03:49:30 +0000 (11:49 +0800)
commit23277c9f8f1bb6232ed950c10fb4db6b42ff8fcf
tree69b773364b38d770edd1b64c12d10bbebe0b24e9
parentafec1107d26923127d59e566b3b843d486b7ffa4
parentf58424c70c1d85280cd3d3f918dfd8a320bba31c
Merge branch 'MDL-60125-master' of git://github.com/andrewnicols/moodle