Merge branch 'MDL-58361-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:04:44 +0000 (15:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:04:44 +0000 (15:04 +0800)
commitc46ae2fbc113a843359294bb1b8d20a7a7f37662
tree1864b08c86c67b49effcdc49a280307697f42945
parent3aa424703b95a10d98cabc8c84f9fb9cee52d749
parentfb73f60a3674c1b4d4550a79c4ee573f1b1ee929
Merge branch 'MDL-58361-master' of https://github.com/xow/moodle