Merge branch 'MDL-57429-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Mar 2017 00:16:07 +0000 (08:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Mar 2017 00:16:07 +0000 (08:16 +0800)
commit640b8efad85ca2e4b54e3c7f5568d6b08f97ec20
tree3c27ee12f19e981a611a5a8c7aaee2bae407cf0e
parent1ea1180a6f01729c0b656b7d2524a9782831dc90
parentcb2a75dcbf996ce2cad3dda0cf8da4fdd0484b3a
Merge branch 'MDL-57429-master' of https://github.com/snake/moodle