Merge branch 'MDL-40759-master-fix1' of http://github.com/damyon/moodle
commitafc8dc90fc446b1576de11de0449e75a784a1b5e
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Mar 2017 03:31:26 +0000 (21 11:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Mar 2017 03:31:26 +0000 (21 11:31 +0800)
tree7e33162547fbb3fd2ccccd06fbcee7b717da489f
parent79262cb6814fdfa99b28f3d3584d33a4357829b4
parentdc633a24b900047e4f2fed290e2701fcb57e5785
Merge branch 'MDL-40759-master-fix1' of github.com/damyon/moodle