Merge branch 'MDL-59365-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Jul 2017 05:04:08 +0000 (13:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Jul 2017 05:04:08 +0000 (13:04 +0800)
commitf6a7d54f246cd5d842a3f888e4bbe232cca1d4f8
tree438ee002e370755c809b2a529f13abbf0f217c37
parente45c3ae9b2cffe11e89be1cc5e74e4c779157495
parentaf6d23853ad7cb61b52f705f7afdf24f83e4dfe6
Merge branch 'MDL-59365-master-fix2' of github.com/damyon/moodle