Merge branch 'MDL-55215-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 03:39:45 +0000 (11:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 03:39:45 +0000 (11:39 +0800)
commit235a80b2d504f0fb13940325f83145b9f84f3e98
tree2538536bcd714c44c328f9287723dbc80bb76738
parentd2790f5c8fda0b33110c53c649335c51e347f78a
parent9f592c243c326c7882c7bb446b8998e24c6b0c50
Merge branch 'MDL-55215-master-fix1' of github.com/damyon/moodle