Merge branch 'MDL-56683-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 03:27:28 +0000 (11:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 03:27:28 +0000 (11:27 +0800)
commit873a7e1e8690d4bc4091b10e51cbb97fa1317f83
treed0f92824d38346640a1ea8b99b1963771c36f949
parent38a8590ed0452ec762db8886dd83cf9920dc6e56
parent52a51514f6b71296434b6b71516733c2bc6fa103
Merge branch 'MDL-56683-master' of git://github.com/damyon/moodle