Merge branch 'MDL-56853-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 06:36:45 +0000 (14:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 06:36:45 +0000 (14:36 +0800)
commit622c84f630c5bc222889ab32c999bae456ef7059
treee8fb601375a218daf82b670bfcc78f6facc44be8
parent8f3a295c6eb8b2554eb368768c3e2c347185ef9b
parentba4173384dfee9edd1dbb3db51dce935092b20c4
Merge branch 'MDL-56853-master' of git://github.com/damyon/moodle