Merge branch 'MDL-59527-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jul 2017 02:42:31 +0000 (10:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jul 2017 02:42:31 +0000 (10:42 +0800)
commit43fd867cc33bc46d89b0d2748ac44b6b0e1e1cfd
treebfacf8facbd2b34920c1fb70fe1241889cb45cac
parent103cd4d39419a61ff39e33be0af0a3fc5c956678
parentddc1482026f8d7d8ce22adf3f833769565b2893b
Merge branch 'MDL-59527-master-fix1' of github.com/damyon/moodle