Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-35980...
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Feb 2017 02:33:40 +0000 (10:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Feb 2017 02:33:40 +0000 (10:33 +0800)
commit3c395fe4865c380fd15f20a0a5aa5a5e3e585118
tree2b9c1992c5021a1c0fc84ed53fb5e67e43764487
parentd83be33f3d26512065bd537dc527ad8cad615d85
parent2671500dee98778e98bda57dee000bdac0ad13b6
Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-35980-master' of git://github.com/snake/moodle