Merge branch 'wip-MDL-58452-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 20 Apr 2017 07:10:21 +0000 (15:10 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 20 Apr 2017 07:10:21 +0000 (15:10 +0800)
commit7b79a90bea08995c0e3d2f6ab64f6d40e2647209
treecd48c91b3c07efb39dddca183d062f2ea490d350
parentcdfcfb1f8cf30d1f2807f74fe4d89d3bf8d91f68
parentfde2e5b1a7a9e1948e2e75a8fc06bae54a5a3474
Merge branch 'wip-MDL-58452-master' of git://github.com/marinaglancy/moodle