Merge branch 'MDL-60031-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 05:56:56 +0000 (13:56 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 05:56:56 +0000 (13:56 +0800)
commit02e10f8592af18b471b58c850f270526c202397b
treeece6c10cd8e53a4c6996310f7c17cf6c9f134c65
parentdd6e17c3b66724b7e7061040f888f5bea0701f77
parent5ded18d5a81de913f2aab36ebd1f21a79d9ae974
Merge branch 'MDL-60031-master' of git://github.com/andrewnicols/moodle