Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Apr 2017 07:38:53 +0000 (15:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Apr 2017 07:38:53 +0000 (15:38 +0800)
commit6fdf167b0f2c9dd4e3accd951faeaf874d2ebc5d
tree561482c8473550b9da740b3c41edcb3b9c3e5fe4
parentbf919ddf021cacb6711bd00fa3b3b97019ad450a
parent8446ba36413c41fe2a4b705db01ef7e0a488e64f
Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle