Merge branch 'MDL-55215-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 07:01:46 +0000 (15:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 07:01:46 +0000 (15:01 +0800)
commitf1b018f51167f3560851df6220ee5df5c2722e6a
tree516dc01c2ce1090f11528ca8cb8353ab7994cf03
parent5ffd3f3309dd241f0d6c7e80c7ef0dd85ef2f9d3
parent737b54fe9e27e1cdb91c05221dcb34d54c2d4dc8
Merge branch 'MDL-55215-master-fix2' of github.com/damyon/moodle