Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 01:46:04 +0000 (09:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 01:46:04 +0000 (09:46 +0800)
commitf669ad5ca75b15770c6582b44debce800a136b31
treebac1d1ad56dd3288bde13a697da640f7593b6af3
parentf59c43a0fa8fc32db99c2daed88329c2348e3513
parentf3432e038ec640e24cda76e1b1d7aedb31c8a2eb
Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle