Merge branch 'MDL-56577-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 06:02:27 +0000 (14:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 06:02:27 +0000 (14:02 +0800)
commitde321206763b5e0ddb6d4a721d1de8a4293d6410
tree80621a02e527abc1949a5e35c6c0e9909a141e0e
parent42a372e20f816c96abc88b2bd25af9b8a24300bc
parent6af2ccda9118b57509cf72e17f19ea6db10a91a3
Merge branch 'MDL-56577-master' of git://github.com/junpataleta/moodle