Merge branch 'wip-MDL-23919-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 01:02:36 +0000 (09:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 01:02:36 +0000 (09:02 +0800)
commit3e577638332a87a3f7c4c48cae536e24acd461a0
treea1f52770ba50aae89a20ddb434555ae3e3c64918
parent5f5f71ea6214b059325eebf3ae0630baa369b454
parent63709b0e162363d4d41d47e38af5c1db17fcdd0c
Merge branch 'wip-MDL-23919-master' of https://github.com/marinaglancy/moodle