Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 03:27:57 +0000 (11:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 03:27:57 +0000 (11:27 +0800)
commitcfa4b26231a40540b6dcf1a70621c1c76091a077
treeff2a3d097d937a57bb6a268eaffbe9ca666014e2
parent43bdbbf682fa30b11df88516a15d7e2dbad56d32
parentcff1f90adf2470e37da7fd480b3427d98b471e1a
Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle