Merge branch 'MDL-57219-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 05:30:23 +0000 (13:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 05:30:23 +0000 (13:30 +0800)
commit1f16e4e68e454067ea2931a27460dfa7a5c94666
treef6b32867f866fbc642724bb3ed6926d7b38bee00
parent995c6d2787c87082d23669d482cb3b325bfbdde0
parente7d0de87c9be4605d7cd9f813a0b45591186f023
Merge branch 'MDL-57219-master' of git://github.com/damyon/moodle