Merge branch 'MDL-58684-master-fix1' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 03:20:39 +0000 (11:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 03:20:39 +0000 (11:20 +0800)
commit1d5a3664888af0666f6dc3413f814243ea0b09a5
tree0e4e4406e079e07f6cbbb4074e3f9ce61669f50b
parentac6b845de78de482930992f7c9c2b5a2b2716d7f
parente927581a50dbbf39b22ab9a49e0e316fe0cc83f1
Merge branch 'MDL-58684-master-fix1' of https://github.com/snake/moodle