Merge branch 'MDL-56820-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 04:20:17 +0000 (12:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 04:20:17 +0000 (12:20 +0800)
commit3302e8bfa501fd67b3e1b7b8ef3fa08e4c389dd0
tree4fea15ad0f145e4d92a48f7417ec35e9ff74e120
parent002ea88630e1eab6eda05b2154e76b29ee9b2ab5
parent700ef8769143d560f37387d77c4809ab7a70c2f7
Merge branch 'MDL-56820-master' of https://github.com/snake/moodle