Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 04:05:46 +0000 (12:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 04:05:46 +0000 (12:05 +0800)
commit4ceece6ea1187ad034e07d34d43f86a42abe2502
treee25d79dcdce5c289d013497567f13e286344acd2
parentcfbc820e1bd6be7a5bd1893bd34d22a8cee23803
parent2f673d8b6aeae39ca6e7770141f2929145e0d6a3
Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle