Merge branch 'MDL-61969-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE
commit78ecf75ead8017fd94a914197e90cbcbce28f61b
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 06:49:44 +0000 (19 14:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 06:49:44 +0000 (19 14:49 +0800)
tree38892eb83ff995a23ecd9a626fc7dcf72db40cf8
parent721fd1795f25df8f4b61c0a6e3931ff38a6322a3
parent22f6afdcd5364d2a34f3e3f2fa1a583987737f59
Merge branch 'MDL-61969-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE