Merge branch 'MDL-55883_m32v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:06:11 +0000 (11:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:06:11 +0000 (11:06 +0800)
commit96eba6b982f88b7159690906d747c948bba0dc93
tree0158da7e054fe783c41716abc4dfaa84356f1fbc
parentb8af6c1ef04a665ea0ad0b84c9ec0e250ad121d8
parent9ff8cdd9715339de19e73b9567b0b8d885518105
Merge branch 'MDL-55883_m32v1' of https://github.com/sbourget/moodle