Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 00:49:48 +0000 (08:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 00:49:48 +0000 (08:49 +0800)
commitb1517237ad3da5ad872a5916aa074ac9d2c9b785
tree988bae6b3afe69098d3a7e2bed74469d70d3f3a5
parentc30bddcfb45eb5f4d3513056ca32e908683a410c
parent26aedd4abff1d1351f4b87de28ff279e78312b3d
Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle