Merge branch 'MDL-55292' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 07:25:45 +0000 (15:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 07:25:45 +0000 (15:25 +0800)
commit27a94d591da642bc7b2615dfbd9ebc43f5687545
tree16cb94ad857e3868af662e2f6f325a04dbb17629
parentbe97f38188e6bc716f538a447997c5107cdbc3fb
parentbdca62ac6dc4e39c955d4cf77442f6ae47ee10f0
Merge branch 'MDL-55292' of https://github.com/mr-russ/moodle